modification css et barre de navigation
Merge branch 'master' of https://github.com/YuLingCheng/pjl-test

Conflicts:
	public/stylesheets/defaut.css~
	views/accueil.jade~
	views/achats.jade~
	views/catalogue.jade~
	views/espaceclient.jade~
	views/header.jade~
	views/lechocolat.jade~
	views/nouveautes.jade~