couleur
couleur fond
Merge branch 'master' of https://github.com/Titaletoffe/BonCoinENSIIE

Conflicts:
	app/views/welcome/index.html.haml
Merge branch 'master' of https://github.com/Titaletoffe/BonCoinENSIIE

Conflicts:
	db/schema.rb