Updated
Initial version
Merge branch 'master' of https://github.com/chitboon/it2299.git

Conflicts:
	ServletExample/WebContent/hello1.html