another update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game.ctxt
	Game.java
Merge branch 'master' of https://github.com/GeorgeKeo/Game

Conflicts:
	Game.class
	Game.ctxt
	Game.java