test

Signed-off-by: ZPaulo <jose.p.s.olive@gmail.com>
Merge branch 'master' of https://github.com/leonardo-faria/LPO

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