branche etudiant1   user tester
Merge pull request #1 from BenoitDesrosiers/etudiant1

branche etudiant1   user tester
Merge branch 'master' of https://github.com/BenoitDesrosiers/test2 into
etudiant2

Conflicts:
	fichier1.php