Merge pull request #8 from taliascotchbrook/taliabranch

calculate_time and calculate_discount