Trabalhando com inimigo.
Merge branch 'master' of https://github.com/JGeovani/Xilocactus.git
---
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/Menu.java
	Xilocactus/src/cuca/che/guevara/xilocactus/inimigos/Inimigo2.java
---
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/inimigos/Inimigo2.java