Bla bla bla
Merge branch 'master' of https://github.com/MadJohnson/HdM-Lander.git

Conflicts:
	src/de/hdm/spe/lander/game/LanderGame.java
	src/de/hdm/spe/lander/states/LevelA.java
	src/de/hdm/spe/lander/states/Menu.java
Merge branch 'master' of https://github.com/MadJohnson/HdM-Lander.git
asdfghj