p2: fic3
Merge branch 'master' of https://github.com/oHInsane/monProjet

Conflicts:
	fichier3.txt