discounts added
Merge branch 'master' of github.com:Brick85/django-qshop