I want to pull :(
Merge branch 'master' of https://github.com/TobiasBodewig/IH11-Game.git

Conflicts:
	IH11-Game/res/data/Player.xml
Merge branch 'master' of https://github.com/TobiasBodewig/IH11-Game.git