fixing merge problem
test on merge
Merge branch 'master' of https://github.com/ThomasAy/Projet1

Conflicts:
	Projet1 - Brouillon/output_fns.php