删除test文件
DOC文档添加
Merge remote-tracking branch 'origin/master'

Conflicts:
	test