show kiféshié
Merge branch 'master' of https://github.com/BarthS/LBC_new

* 'master' of https://github.com/BarthS/LBC_new:
  modification chez maire2

Conflicts:
	app/views/profil/show.html.haml