Add a StaticPages controller
Finish static pages
Merge branch 'master' of github.com:michaelkalman/sample_app