Vesion1.0
ChatServlet
chat.jsp
Merge branch 'master' of https://github.com/Yanbozhao/WEBCHAT

Conflicts:
	build/generated/classes/org/apache/jsp/index_jsp.class
	build/generated/src/org/apache/jsp/index_jsp.class.smap
	build/generated/src/org/apache/jsp/index_jsp.java
	build/web/index.jsp
	web/index.jsp