Filling in Layout
Merge branch 'filling-in-layout'

Conflicts:
	app/views/layouts/_shim.html.erb
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
	config/application.rb
	config/routes.rb