Correction conflit
Ajout de la conversion mètres en pixels
maj
Merge branch 'master' of https://github.com/H4201/DevOO.git

Conflicts:
	src/com/h4201/prototype/app/Lanceur.java