end 5.2.3 Named Routes
Merge branch 'ch5-filling-in-layout'

Conflicts:
	app/views/pages/help.html.erb
	config/routes.rb~