modified binary file?
Merge branch 'master' of https://github.com/zemetheus/Project6

Conflicts:
	bin/Game.class