删除无用文件
Merge remote-tracking branch 'origin/master'

Conflicts:
	README