Changes to header
Merge branch 'master' of https://github.com/The-Critical-Few/plateworthy

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.html.erb
Escape fix