Conflicts:
	AUTHORS
This commit is contained in:
Bob Nystrom
2015-01-05 21:58:23 -08:00

View File

@ -4,3 +4,4 @@ end of this list.
Robert Nystrom <robert@stuffwithstuff.com>
Kyle Marek-Spartz <kyle.marek.spartz@gmail.com>
Paul Woolcock <paul@woolcock.us>