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

Conflicts:
	fichier1.php
Merge pull request #3 from BenoitDesrosiers/etudiant1

Etudiant1