sales
conflict  resolved sales
errors corrected
Merge branch 'master' of https://github.com/technomicssolutions/smartbook