b
Merge remote-tracking branch 'origin/Test' into Test
choix c

Conflicts:
	index.html