small changes
solve conflicts

Conflicts:
	Classes/AttackTower.cpp
	Classes/Unit.cpp
	Classes/Unit.h