end 5.2.2 Rails Routes
Merge branch 'ch5-filling-in-layout'

Conflicts:
	app/views/pages/home.html.erb~