Merge branch 'master' of github.com:dreadkopp/test

Conflicts:
	bin/Game.class
	src/Game.java