test 10
Merge remote-tracking branch 'choose_remote_name/master'
Merge branch 'master' of https://github.com/ttingchan/CDWeb.git
User.java UserDAO.java ConnectionManager.java LoginServlet.java
asd
test 13
Merge remote-tracking branch 'choose_remote_name/master'
test 14
test 15
test test1
Merge remote-tracking branch 'choose_remote_name/master'
test test test
test test test test
test research
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/main/webapp/WebRoot/login.jsp
	src/main/webapp/WebRoot/searchresult.jsp
	src/main/webapp/index.jsp
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/main/webapp/WebRoot/searchresult.jsp
	src/main/webapp/index.jsp
	src/main/webapp/login.jsp
back-up
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/main/webapp/WebRoot/searchresult.jsp