这是客户端的提交！
Merge branch 'master' of https://github.com/super99199/glave-daily

Conflicts:
	client.txt
Signed-off-by: superma <aa@qq.com>
这个是实验