Revert 8758615..d178f43

This rolls back to commit 875861512ecca457de1cfdfb074050927f8dff4a.
Revert c21d378..66a3bcb

This rolls back to commit c21d378d9e865ddd35cc39f91f4cb9ea3113803e.
Fix lost
Merge branch 'master' of https://github.com/vominhnhut99/TinyZodiacs

Conflicts:
	.gitignore
	Classes/AppDelegate.cpp
	Classes/ForegroundDTO.cpp
	Classes/GameManager.cpp
	Classes/GameWorld.cpp
	Classes/LayerIndexConstants.h
	Classes/Map.cpp
	Classes/Map.h
	Classes/MapCreator.cpp
	Classes/MapCreator.h
	Classes/MapDTO.cpp
	Classes/MapDTO.h
	Classes/MapFactory.cpp
	Classes/MapObject.cpp
	Classes/MapObjectDTO.cpp
	Classes/MapObjectDTO.h
	Classes/NoBodyMapObject.cpp
	Classes/NormalAttack.cpp
	Classes/ObjectFactory.cpp
	Classes/ObjectFactory.h
	Classes/XMLMapParser.cpp
	Classes/XMLMapParser.h
	Resources/map1.xml
	Resources/map1_background_spritesheet_1.plist
	Resources/map1_background_spritesheet_1.png
	Resources/map1_background_spritesheet_2.plist
	Resources/map1_background_spritesheet_2.png
	Resources/map1_spritesheet_1.plist
	Resources/map1_spritesheet_1.png
	Resources/map1_spritesheet_2.plist
	Resources/map1_spritesheet_2.png
	Resources/map1_spritesheet_3.plist
	Resources/map1_spritesheet_3.png
	Resources/map1_spritesheet_4.plist
	Resources/map1_spritesheet_4.png
	proj.ios/TinyZodiacs.xcodeproj/project.pbxproj

proj.ios/TinyZodiacs.xcodeproj/project.xcworkspace/xcshareddata/TinyZodi
acs.xccheckout

proj.ios/TinyZodiacs.xcodeproj/project.xcworkspace/xcuserdata/nhut.xcuse
rdatad/UserInterfaceState.xcuserstate
dumb

commit