删除垃圾文件
Merge branch 'master' of git@github.com:matyhtf/GoWebIM.git

Conflicts:
	README.md