modifs
git commit -m modifs:q
Merge branch 'refonte' of https://github.com/SimplonVillage/simplon-village into refonte

Conflicts:
	source/blog.html.erb
Merge branch 'refonte' of https://github.com/SimplonVillage/simplon-village into refonte
Merge branch 'refonte' of https://github.com/SimplonVillage/simplon-village into refonte
Merge branch 'refonte' of https://github.com/SimplonVillage/simplon-village into refonte
lolilol
Merge branch 'refonte' of https://github.com/SimplonVillage/simplon-village into refonte