minor changes
Merge branch 'master' of https://github.com/Quayed/11_del3.git

Conflicts:
	src/game/GameController.java