More combat, health, 7 tools
Merge branch 'master' of https://github.com/Jing361/SeniorProjectAdventures

Conflicts:
	Evo Torque2D/GameModules/ArenaModule/1/scripts/Arena.cs