push from eclips
Merge branch 'master' of https://github.com/min2das/SimpleServlet.git

Conflicts:
	SimpleServlet/WebContent/index.jsp