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

Conflicts:
	Classes/Constants.h
	Classes/GameMenuLayer.cpp
	Classes/GameMenuLayer.h
	Classes/Monster.cpp
	Classes/MonsterFactory.cpp
	Resources/map1.xml
	proj.ios/TinyZodiacs.xcodeproj/project.pbxproj