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

Conflicts:
	Classes/AnimationLoader.cpp
	Classes/GameObject.cpp
	Classes/Hero.cpp
	Classes/Item.cpp
	Classes/Item.h
	Classes/Monster.cpp
	Classes/MonsterFactory.cpp
	Classes/PhysicConstants.h
	Resources/map1.xml
	Resources/monster_onion.xml
	proj.ios/TinyZodiacs.xcodeproj/project.pbxproj