Merge pull request #22 from alarmhouse/deploy

Coupon bugfix
Update coupon.phtml
Merge pull request #23 from alarmhouse/deploy

Discount template for cart
Free delivery bar added