work in progress
Merge branch 'master' of github.com:JessicaG/sales_engine
work inprogress