sa marche
Merge remote-tracking branch 'origin/master'

Conflicts:
	salut.html
ferme ta guele