Conflito resolvido em Jogo
Commit
Merge branch 'master' of https://github.com/JGeovani/Xilocactus.git