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

Conflicts:
	src/de/hdm/spe/lander/game/Game.java
	src/de/hdm/spe/lander/models/OptionManager.java