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