bundle actualizado
Merge branch 'master' into static-pages
Add a StaticPages controller
added rspec_helper
Merge branch 'static-pages'
Finish static pages