Finish layout and routes
Finish layout nad routes
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
	app/views/layouts/application.html.erb
	app/views/static_pages/contact.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb
	spec/requests/user_pages_spec.rb
	spec/support/utilities.rb
all
1
another 1
2
conflict resolution