correçao
Merge branch 'master' of https://github.com/leonardo-faria/LPO

Conflicts:
	my-gdx-game-core/src/com/Lpoo/game/JumpEm.java