hahahaha
keep working on tankcreator
Merge branch 'master' of https://github.com/sugordon/Tonka.git

Conflicts:
	src/game/Game.java
	src/game/Tank.java