Up to date with shopping cart
Merge branch 'master' of https://github.com/TechTrinkets/techtrinkets

Conflicts:
	src/java/model/Product.java