Signed-off-by: jsabbatier <justine.sabbatier@imerir.com>

Ajout de la section canevas, changement de la charte du site
Merge branch 'master' of git@github.com:Python15/BadMonkey.git

Conflicts:
	Gestion projet/gantt_initial.png

Signed-off-by: jsabbatier <justine.sabbatier@imerir.com>
Merge branch 'master' of git@github.com:Python15/BadMonkey.git
Merge branch 'master' of git@github.com:Python15/BadMonkey.git