delete all
Merge branch 'master' of git@github.com:hh201020/test04.git

Conflicts:
	WebContent/test04hh.html