Merge branch 'master' into static-pages
Add a StaticPages controller
too lazy
static will be overwritten
Merge branch 'master' into static-pages
Merge branch 'static-pages' of https://github.com/btwcnoob/sample_app into static-pages
testing gems added
Merge branch 'static-pages'