espace reduit
Merge branch 'matthieu' of https://github.com/comem/zed into ginold
Nouvelle branche formulaire
Merge branch 'adamBranche' of https://github.com/comem/zed into formulaires
formulaires base
css form
forms artiste

déroule enroule
Merge branch 'formulaires' into rich

Conflicts:
	css/style.css
	css/style.less
	index.php
yeah ca marche