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

Conflicts:
	src/Core/Event.java
	src/Core/Player.java