added google webmaster and affiliates
Added free shipping
removed free shipping as is crashes server
Merge branch 'heroku' into HEAD

Conflicts:
	public/assets/application-2999aa1f7c1edcdad4a1d6eb817b7975.js.gz
	public/assets/application.js.gz
	public/assets/store/all-28d1304d41cac2308dc7a723e8c7dafc.js.gz
	public/assets/store/all.js.gz
fixing branches
added free shipping calculator