Travis' weapon file changes
Travis' weapon changes
Merge branch 'master' of https://github.com/chensen13/TankWarsC

Conflicts:
	Data.txt
	bin/HelpScreen$KeyClass.class
	bin/HelpScreen.class