completed level 1 and part of level 2 rspec tests
Merge pull request #1 from shmeadyy/laura_and_marions_branch

completed level 1 and part of level 2 rspec tests