This is effed up
Added a Contact page
Make routes
Update links
Refactor tests
Add rspec utility
Get rid of index.html
Finish layout and routes; add user signup page stub
Merge branch 'filling-in-layout'

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/_shim.html.erb
	spec/requests/static_pages_spec.rb
Fix git weirdness
Merge branch 'making-routes'