before leaving
before layout merge
Enhanced layout
Finish layout and routes
Merge branch 'filling-in-layout'

Conflicts:
	config/routes.rb
	log/test.log