added rspec
Added static-pages, tests fail
Merge branches 'master' and 'static-pages'