Finish static pages
Merge branch 'master' of https://github.com/Kidarmstrong/sample_app