Update Gemfile for tests
Add a StaticPages controller
Merge branch 'static-pages'