Groupe 2
Merge branch 'master' of https://github.com/NaturalSolutions/atelier-git

Conflicts:
	index.html