Merge
Merge branch 'master' of https://github.com/vegaro/cse_135_project.git

Conflicts:
	cse135/WebContent/header.jsp
Stars shopping cart
Merge branch 'master' of https://github.com/vegaro/cse_135_project

Conflicts:
	cse135/WebContent/browse.jsp
	cse135/WebContent/product.jsp
	cse135/src/DeleteProduct.java
	cse135/src/dao/ProductDao.java
	cse135/src/dao/UserDao.java
	cse135/src/model/User.java