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

Conflicts:
	Classes/Affect.cpp
	Classes/MapCreator.cpp
	proj.ios/TinyZodiacs.xcodeproj/project.pbxproj