directivizing the check out page
you have no giftcard
Merge branch 'master' of https://github.com/Four51/AngularJSOrder
checkout refactoring
Merge branch 'master' of https://github.com/Four51/AngularJSOrder
tiny bit of cleanup
removing product debug text
design
Merge branch 'master' of https://github.com/Four51/AngularJSOrder

Conflicts:
	app/partials/checkOutView.html
	app/partials/controls/giftCardRedemption.html
SPA-10840  Coupons - coupons broken
line item flex design update
Merge branch 'master' of https://github.com/Four51/AngularJSOrder
Merge pull request #94 from ionlyseespots/master

design
dunno, but it said I changed thumbs.db
Merge branch 'master' of https://github.com/Four51/AngularJSOrder

Conflicts:
	app/css/app.css