Eh wurst :D
Merge branch 'master' of https://github.com/Skrechy/Zombieland.git

Conflicts:
	ZombieLand/src/controller/ControlPlayer.java
	ZombieLand/src/game/Startup.java