For Huan
For Huan
Merge branch 'master' of https://github.com/huw30/BookMart

Conflicts:

BookMart/build/generated/classes/org/apache/jsp/client/register_jsp.clas
s

BookMart/build/generated/src/org/apache/jsp/client/register_jsp.class.sm
ap
	BookMart/build/generated/src/org/apache/jsp/client/register_jsp.java
	BookMart/build/web/WEB-INF/classes/edu/pitt/dao/impl/BookDaoImpl.class
	BookMart/build/web/WEB-INF/classes/edu/pitt/dao/impl/UserDaoImpl.class

BookMart/build/web/WEB-INF/classes/edu/pitt/web/client/CategoryServlet.c
lass

BookMart/build/web/WEB-INF/classes/edu/pitt/web/client/RegisterServlet.c
lass
	BookMart/build/web/client/body.jsp
	BookMart/build/web/client/bookDetail.jsp
	BookMart/build/web/client/profileLeft.jsp
	BookMart/build/web/index.jsp
	BookMart/nbproject/private/private.properties
	BookMart/src/java/edu/pitt/dao/impl/BookDaoImpl.java
	BookMart/src/java/edu/pitt/dao/impl/UserDaoImpl.java