game changes already made
Merge branch 'master' of git@github.com:minardar/PuzStrike.git

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