modif guillaume ligne 43
Merge branch 'master' of https://github.com/YvesKamdjo/cd-dev

Conflicts:
	index.php