solve conflict
Merge branch 'jspImpl' of https://github.com/dto80/CDU_CMU2.git into
jspImpl

Conflicts:
	src/main/java/edu/cmucdu/ecommerce/dao/product/SellerProductDao.java