Add a StaticPages controller
Create passing test
Merge branch 'static-pages'
Merging static pages with master