Ah Queue koukou
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
Merge branch 'master' of https://github.com/Max311/Projet-PHP

Conflicts:
	index.php
merge