implemented fixes to make merchant rspec tests pass
Merge branch 'master' of github.com:kareemgrant/sales_engine