je vire le revert
Merge branch 'master' of https://github.com/Xyrodileas/jeu2D

Conflicts:
	.idea/workspace.xml