Dunno why got some files here I'm forced to commit
Merge branch 'master' of https://github.com/MultiHopHop/ProjectGame

Conflicts:
	bin/classes/com/badlogic/androidgames/mygame/GameScreen.class
	bin/classes/com/badlogic/androidgames/mygame/ServerScreen$ServerThread.class
	bin/classes/com/badlogic/androidgames/mygame/ServerScreen.class
	bin/classes/com/badlogic/androidgames/mygame/World.class