cleanup
Merge branch 'master' of https://github.com/propra13-orga/gruppe53.git

Conflicts:
	Game/src/progprak/gruppe53/game/GameLogic.java
Merge branch 'master' of https://github.com/propra13-orga/gruppe53.git
cleanup