merchant_test
Merge branch 'master' of github.com:ebdrummond/sales_engine into item_test
updating merchant find