fgslfn!mlzA.HNKEZ
Merge branch 'master' of https://github.com/Josk/VolcanoEscape
Merge branch 'master' of https://github.com/Josk/VolcanoEscape

Conflicts:
	VolcanoEscape/src/fr/romainpedra/VolcanoEscape/GameScreen.java