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

Conflicts:
	source/index.html.erb
	source/nos_produits_et_services.html.erb