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