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

Conflicts:
	Classes/Effect.cpp
	Classes/MonsterFactory.cpp
	Resources/map1.xml