bugg fix
Merge branch 'master' of https://github.com/krille0x7c2/GameProjekt.git

Conflicts:
	my-gdx-game/src/com/me/mygdxgame/MyGdxGame.java
	my-gdx-game/src/com/me/mygdxgame/Screens/SplashScreen.java