restore gitignore
Add a StaticPages controller
Merge branch 'static-pages'
static will be overwritten
Merge branch 'master' into static-pages
Merge branch 'static-pages' of https://github.com/btwcnoob/sample_app into static-pages