lzl version2
lzl version3
:# Please enter the commit message for your changes. Lines starting
lzl version4
lzl version5
:# Please enter the commit message for your changes. Lines starting
lzl versionMerge branch 'master' of https://github.com/Luvinahlc/StudentManager

Conflicts:
	StuManager/WebRoot/WEB-INF/classes/com/stuman/dao/DAOFactory.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/dao/imp/HibernateDAOFactory.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/domain/Student.class
	StuManager/WebRoot/WEB-INF/classes/com/stuman/domain/Student.hbm.xml
	StuManager/WebRoot/WEB-INF/classes/com/stuman/web/jsf/bean/LoginBean.class
	StuManager/WebRoot/css/homepage.css
	StuManager/WebRoot/css/inner.css
	StuManager/src/com/stuman/dao/DAOFactory.java
	StuManager/src/com/stuman/dao/imp/HibernateDAOFactory.java
	StuManager/src/com/stuman/domain/Student.hbm.xml
	StuManager/src/com/stuman/domain/Student.java
	StuManager/src/com/stuman/web/filters/SetEncodingFilter.java
	StuManager/src/com/stuman/web/jsf/bean/LoginBean.java
	StuManager/src/hibernate.cfg.xml