add outstanding commits
Add a StaticPages controller
Finish static pages
Finish static pages with additional exercises
git merge of branch and master