fix collision, buggy gui
working gui
Merge branch 'direction' of https://github.com/lijiaqigreat/ateam-tanks into lijiaqigreat-direction

Conflicts:
	src/Game.java
	src/Obstacle.java
	src/SimpleTank.java
	src/Sprite.java
Merge pull request #38 from RoboNickBot/lijiaqigreat-direction

Lijiaqigreat direction