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
Revert 7c415ac..4ad837f

This rolls back to commit 7c415acb1a0090a04b4cf41c50ca80e05186c378.
Attempt to merge new side-nav