added tests and functionality for the merchant class
Merge branch 'merchants'