Merge branch 'master' into keith
Merge branch 'master' into keith
poem pages
title scaffold
scaffolded leaders teachers class page activities honors graduates autographs
cheer scaffold
Merge branch 'keith' into rob

Conflicts:
	config/routes.rb