small refactor on merchant class
merging origin and my files
Merge branch 'master' of https://github.com/lalalainexd/sales_engine
blah
Merge branch 'master' of https://github.com/lalalainexd/sales_engine
changing id's to integers
merging id change work
Merge branch 'master' of https://github.com/lalalainexd/sales_engine