Install rspec and associated gems
continue addition of rspec
What just happened?
Merge branch 'master' of https://github.com/jcuratolo/pmmgmt
Reset db
Conflicts resolved.
Ready
Merge conflicts resolved.