product order

can successfully add items to the cart
Merge branch 'master' of https://github.com/hawaiianchimp/CSE135-Project

Conflicts:
	WebContent/products.jsp