uncommented tests
fix merge conflicts
Merge branch 'master' of https://github.com/danny-g/sales_engine
fix merge conflict in csv_parser.rb