dumb
Merge branch 'master' of https://github.com/vominhnhut99/TinyZodiacs

Conflicts:
	Classes/NormalAttack.cpp
	Resources/map1.xml
	Resources/tower_1.xml
	Resources/tower_2.xml