Finish static pages
Merge branch 'static-pages' of github.com:mhadj1/sample_app into static-pages