client changed
Merge branch 'master' of github.com:qintxwd/test2

Conflicts:
	test.cpp