1.6
test
Merge branch 'master' of https://github.com/zhuhan1236/HourglassScheme

Conflicts:
	.classpath
	bin/server/ConnHandle.class
	bin/server/HourglassHandle.class
	bin/server/Listener.class
	bin/server/NormalHandle.class