Just started
Finished
fixed conflicts!
Merge pull request #82 from tararoys/fix_rspec

Fix rspec