7-27-14 3:32pm
Coupon Insertion Works (with cash)
7-28-14 1:15pm
Cash, Display, Main, Mainframe changes
Nuked .jpg
Added to credit card control flow
So Merge, Very conflict, Wow
So Mergey, Very conflicts, Wow
Merge branch 'master' into John