ajout liste
test master
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
preparation merge
Merge branch 'dev'

Conflicts:
	index.html