.
Merge branch 'master' of github.com:CS377W/GDK

Conflicts:
	bin/classes/.gitignore