Essai
Merge branch 'master' of https://github.com/thibautha/ProjetPHP

Conflicts:
	tmp/0hac6cxw48f.0ht5qzz0p7z.php
	tmp/0hac6cxw48f.0hvljm2tzej.php
	tmp/0hac6cxw48f.0ifujnta9j6.php
	tmp/0hac6cxw48f.0si5n0gz6z2.php
	tmp/0hac6cxw48f.0zgfl3xpxf2.php
	tmp/0hac6cxw48f.2hv5b0wv3t2.php