finish static pages
Merge branch 'master' of https://github.com/samuels410/sample_app