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

Conflicts:
	my-gdx-game-desktop/src/com/me/mygdxgame/Main.java