Add fixtures and test_helper
Add Merchant/MerchantRepository
Merge pull request #2 from wfro/development

Development