1st
Merge branch 'master' of https://github.com/candrewo/discount_calculator