poem pages
title scaffold
cheer scaffold
Merge branch 'keith' into rob

Conflicts:
	config/routes.rb