Added collision detection handling
Merge branch 'master' of https://github.com/javacslip/battle-tanks.git

Conflicts:
	battletanks/graphics/Drawer.java