zxCSZ
Merge branch 'master' of https://github.com/ShinojShayin/Hitest

Conflicts:
	hitest/src/com/hitest/HitestServlet.java