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

Conflicts:
	Resources/list_skill.xml
	proj.ios/TinyZodiacs.xcodeproj/project.pbxproj