barra 2 levanu emma
Merge branch 'master' of https://github.com/jucimarjr/posueagames

Conflicts:
	rafaelima/ArcaneForest/js/config/Config.js
	rafaelima/ArcaneForest/js/states/Game.js