intégration modification
Merge branch 'master' of https://github.com/clairezed/Metinet_RoiFete

Conflicts:
	index.html