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

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/static_pages_controller.rb
rspec ApplicationHelper update