Added StaticPages controller
Added navbar
Merge branch 'static-pages'
Merge branch 'navbar'
merging things