Implemented discount
Merge branch 'discount'