Modified index.html, MyServlet.java and SampleServlet.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	it2299/WebContent/index.html
	it2299/src/demo/MyServlet.java