indentation
Merge remote-tracking branch 'origin/project' into project

Conflicts:
	accueil.php