My chances
Merge branch 'master' of https://github.com/goldenthree/Tank-Scuffle

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