Verificando problema com Heroi
Merge branch 'master' of https://github.com/JGeovani/Xilocactus.git

Conflicts:
	Xilocactus/src/cuca/che/guevara/xilocactus/Jogo.java
	Xilocactus/src/cuca/che/guevara/xilocactus/heroi/TomCaatingueiro.java