Finished discountStrategy and updated product class code