added the merchant class and test
Merge pull request #22 from bryceholcomb/add_merchant

added the merchant class and test