resolved conflict
rebasing
created basic tests for the Product model
one small edit
fixed minor rspec issues with Zoe
Merge pull request #4 from daveyk535/rspec1

tests look good!