Add rspec to app.
Merge conflict