Add a StaticPages controller
added static pages
fixed html structure
fixed merge conflicts