Signed-off-by: Yuan Cao <mail@caoyuan.me>
Merge branch 'master' of https://github.com/wondermac/Task8-Repo.git
Merge branch 'master' of https://github.com/wondermac/Task8-Repo.git

Conflicts:
	WebContent/index.jsp

Signed-off-by: Yuan Cao <mail@caoyuan.me>