discounts revision basic promotions added.
Merge branch 'discount-promotions'
Merge branch 'master' of https://github.com/16twenty/providr