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

Conflicts:
	Classes/Character.cpp
	Classes/GameObject.h
	Classes/NormalAttack.cpp
	Resources/map1.xml
Merge branch 'master' of https://github.com/vominhnhut99/TinyZodiacs

Conflicts:
	Classes/Character.cpp
	Classes/GameObject.h
	Classes/NormalAttack.cpp
	Resources/map1.xml