chat example
web simple servlet api
week9 home
Merge branches 'master' and 'yach_branch' of https://github.com/presly808/ACP2 into yach_branch

Conflicts:
	WebSimple/pom.xml
	WebSimple/src/main/java/servlets/AdditionalTestServlet.java
	WebSimple/src/main/java/servlets/ContextTestServlet.java
	WebSimple/src/main/java/servlets/HelloServlet.java
	WebSimple/src/main/java/servlets/SessionTestServlet.java
	WebSimple/src/main/webapp/WEB-INF/web.xml
	WebSimple/src/main/webapp/pages/user-list.jsp
	pom.xml