Jump
Merge branch 'master' of https://github.com/Aldrian/projetPoney

Conflicts:
	src/Core/MovingEntity.java