Cleaning up
Merge branch 'master' of https://github.com/TobiasBodewig/IH11-Game.git
Export Bug-Fixing.
Merge branch 'master' of https://github.com/TobiasBodewig/IH11-Game.git

Conflicts:
	IH11-Game/src/staging/StageShop.java