Finish layout and routes
Merge branch 'filling-in-layout'

Conflicts:
	spec/requests/static_pages_spec.rb
	spec/support/utilities.rb