commiting local changes of long ago
Merge branch 'master' of github.com:paratrooper5730/opencart-blank-theme

Conflicts:
	template/product/product.tpl