new commit 2
Merge branch 'master' of https://github.com/KhoaNN/AssignmentWPSJ

Conflicts:
	web/Hello.jsp
new
test
aaaaa