test commit

Signed-off-by: huoex <huoex0628@gmai.com>
Merge branch 'master' of https://github.com/huoex/SI_demo

Conflicts:
	src/com/hex/connecttest.java