new images
patched order.jade
more changes from live site, like attribution link color
Merge branch 'new-images'

Conflicts:
	app/coffee/main.coffee
	app/index.jade
	app/modules/navbar.jade
	app/sass/_global.scss
	www/assets/styles/main.css
	www/bodycare.html
	www/chocolat.html
	www/index.html
	www/order.html
	www/story.html
back to square one