resync text
Merge and Damage Contorl
Merge branch 'master' of https://github.com/SoraZodia/ICS111-HAL9001

Conflicts:
	TextPaser/src/com/hal9001/main/AntimationEngine.java