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