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