Merge remote-tracking branch 'eljefeo/JRN_Assignment2-master'

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/java/business/Cart.java
	src/java/cart/CartServlet.java
	src/java/cart/Checkout.java
	src/java/data/ItemDB.java
	web/META-INF/context.xml
	web/WEB-INF/web.xml
	web/cart.jsp
	web/checkout/finish.jsp
	web/checkout/review.jsp
	web/finish.jsp
	web/index.jsp