Merge pull request #1 from BenoitDesrosiers/etudiant1

branche etudiant1   user tester
user benoit  branche etudiant2 
devrait faire un conflit sur fichie1
Merge branch 'master' of https://github.com/BenoitDesrosiers/test2 into
etudiant2

Conflicts:
	fichier1.php
Merge pull request #2 from BenoitDesrosiers/etudiant2

Etudiant2
Merge branch 'master' of https://github.com/BenoitDesrosiers/test2 into
etudiant1

Conflicts:
	fichier1.php