Mon criss de commit...
Le merge
Merge remote-tracking branch 'origin/master' into etudiant1

Conflicts:
	fichier1.php