add client flag
Merge branch 'master' of github.com:qintxwd/test12

Conflicts:
	test.cpp
fix a conflict