minor fixes
guy rework (yet again)
Merge branch 'master' of https://github.com/TheMSB/P2EO

Conflicts:
	P2_EINDOPDRACHT/src/game/Game.java