test
da
te
fr
Merge remote-tracking branch 'origin/HEAD' into HEAD
Georgs Zeug
Merge branch 'HEAD' of
https://github.com/UnicornFucker/CowboyAndAliens.git into HEAD

Conflicts:
	core/src/de/comyoutech/cowboyandalien/GameScreen.java
	core/src/de/comyoutech/cowboyandalien/MyGdxGame.java
	desktop/src/de/comyoutech/cowboyandalien/desktop/DesktopLauncher.java