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

Conflicts:
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	config/routes.rb