! merged with Marty's stuff
+ added confirmation page
~ minor changes to products pages
Merge branch 'master' of https://github.com/boldeagle3/MartyParty.git

Conflicts:
	WebContent/ProductOrder.jsp
	
No actual conflict, just eclipse being annoying.