Finish layout and routes
Edited routes.rb
Merge branch 'filling-in-layout'

Conflicts:
	config/routes.rb