Merge branch 'layoutstuffs'
Merge branch 'layoutstuffs'
Add partials for shim and header
Add footer partial and styling
Improve custom footer CSS
Merge branch 'partials'
Add contact page tests
Merge branch 'layoutstuffs'

Conflicts:
	app/assets/stylesheets/custom.css.scss
Resolve conflict in custom.css
Update test for custom path
Update routing
Update header and footer with functioning links
Whoops, forgot logo linkage
Simplified tests
Merge branch 'links'
Merge branch 'master' into layoutstuffs