changement gerald: liste des idees
Merge branch 'master' of https://github.com/dorianDock/agile
Merge branch 'master' of https://github.com/dorianDock/agile
la
Merge branch 'master' of https://github.com/dorianDock/agile

Conflicts:
	index.php