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

Conflicts:
	my-gdx-game-android/gen/.gitignore
Merge branch 'master' of https://github.com/krille0x7c2/GameProjekt.git

Conflicts:
	my-gdx-game/bin/com/me/mygdxgame/Screens/SplashScreen$1.class
	my-gdx-game/bin/com/me/mygdxgame/Screens/SplashScreen.class
Merge branch 'master' of https://github.com/krille0x7c2/GameProjekt.git

Conflicts:
	my-gdx-game-android/gen/.gitignore
	my-gdx-game/bin/com/me/mygdxgame/Screens/ScoreScreen.class
	my-gdx-game/bin/com/me/mygdxgame/Screens/SplashScreen$1.class
	my-gdx-game/bin/com/me/mygdxgame/Screens/SplashScreen.class
	my-gdx-game/src/com/me/mygdxgame/Screens/ScoreScreen.java
Merge branch 'master' of https://github.com/krille0x7c2/GameProjekt.git
hoho
Merge branch 'master' of https://github.com/krille0x7c2/GameProjekt.git
ho