d'accord
Merge branch 'master' of https://github.com/arthur073/IHM.git

Conflicts:
	fuelissimo/src/View/Settings.mxml
Merge branch 'master' of https://github.com/arthur073/IHM.git