To switch to master
Finish layout and routes
Merge branch 'filling-in-layout'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
	spec/requests/static_pages_spec.rb