Combate criado!
Merge branch 'master' of https://github.com/mateuscgc/shes-in-another-castle

Conflicts:
	main.js