Initial commit
Subo el proyecto
Subo el proyecto android
Subo el proyecto desktop
Modifico
He hecho el capítulo 5
Merge remote-tracking branch 'origin/master'

Conflicts:
	my-gdx-game-android/project.properties
	my-gdx-game-desktop/.classpath
	my-gdx-game-desktop/bin/com/me/mygdxgame/Main.class
	my-gdx-game-desktop/src/com/me/mygdxgame/Main.java
	my-gdx-game/bin/com/me/mygdxgame/CameraHelper.class
	my-gdx-game/bin/com/me/mygdxgame/Constants.class
	my-gdx-game/bin/com/me/mygdxgame/MyGdxGame.class
	my-gdx-game/bin/com/me/mygdxgame/WorldController.class
	my-gdx-game/bin/com/me/mygdxgame/WorldRenderer.class
	my-gdx-game/src/com/me/mygdxgame/CameraHelper.java
	my-gdx-game/src/com/me/mygdxgame/Constants.java
	my-gdx-game/src/com/me/mygdxgame/MyGdxGame.java
	my-gdx-game/src/com/me/mygdxgame/WorldController.java
	my-gdx-game/src/com/me/mygdxgame/WorldRenderer.java
Subido de nuevo, actualizado con todo
Subo los objetos
No se que subo
Poza no la lies de nuevo xD
Merge branch 'master' of https://github.com/ismavd/SpaceRunners.git
Subo level
Hago el push
Probando
Merge branch 'master' of https://github.com/ismavd/SpaceRunners.git

Conflicts:
	my-gdx-game/bin/com/me/mygdxgame/CameraHelper.class
	my-gdx-game/bin/com/me/mygdxgame/Constants.class
	my-gdx-game/bin/com/me/mygdxgame/MyGdxGame.class
	my-gdx-game/bin/com/me/mygdxgame/WorldController.class
	my-gdx-game/src/com/me/mygdxgame/CameraHelper.java
	my-gdx-game/src/com/me/mygdxgame/Constants.java
	my-gdx-game/src/com/me/mygdxgame/MyGdxGame.java
	my-gdx-game/src/com/me/mygdxgame/WorldController.java
	my-gdx-game/src/com/me/mygdxgame/WorldRenderer.java