added StaticPages controller
Added tests and "about us"
changed layout, simplified html pages
Merge branch 'static-pages'
Merge branch 'master' into static-pages