érreures
Merge branch 'master' of https://github.com/Akinesis/DinoSurvive

Conflicts:
	src/Controleur/Controleur.java
ddd