fix rspec test
Deleted stylesheets
Fix merge conflict
Merge pull request #5 from crystalperreira/rspec2

Rspec2