Add a StaticPages controller
static pages
Merge branch 'static-pages'

Conflicts:
	config/routes.rb