Added a StaticPages controller
Rspec added
Finish static pages
Merge fixes