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

Conflicts:
	Resources/list_effect.xml
	Resources/list_skill.xml