first commit - checkout kata half complete (pre-discounts)
merge