tillFreeShip set to $50 / version

For holiday season the cart will show amount till free shipping based on
the $50 or more shipping rule.
version

oops.
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html