fixed sanitation errors except for revenue method in merchant, lines 30 & 33
Merge branch 'master' of github.com:JessicaG/sales_engine
fixed merge files