tiny stuff
Merge branch 'master' of https://github.com/edib0y/lazyGroupShooter

Conflicts:
	src/gameengine/GameEngine.java