edit the Gemfile
Add a StaticPages controller
Finish static pages
Merge branch 'static-pages'