adding initial functionality for merchant items
fixed merge issues
added some functionality for most items
Merge branch 'master' of https://github.com/trayo/sales_engine into 67_most_items_for_merchant
added total items for merchant
fixed merge conflicts
Merge pull request #90 from trayo/67_most_items_for_merchant

67 most items for merchant