Model Rspec tests completed
Resolve merge conflict
Merge pull request #30 from newrube7/ruben/rspec

Ruben/rspec