sexe
maj
Merge branch 'master' of https://github.com/SimplonVillage/volailles-des-sablons
modif
maj
Merge branch 'master' of https://github.com/SimplonVillage/volailles-des-sablons

Conflicts:
	source/contact.html.erb
	source/stylesheets/site.css.scss
modif
Merge branch 'master' of https://github.com/SimplonVillage/volailles-des-sablons