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