Rspec2

Fixed allllllll the merge conflicts.