Thomas's code from the fork.
Merge remote-tracking branch 'origin/master'.  Fixed errors in
merging Thomas's code with groups' code.

Conflicts:
	TankWars/src/com/amphibian/tankwars/TankWars.java