commit web.xml
Merge branch 'master' of git://github.com/maggiemeng92/Part4.git

Conflicts:
	war/WEB-INF/web.xml
some changes made in web.html