doing test
Merge branch 'master' of https://github.com/lihuiba/SoftSAN

Conflicts:
	Client.py