修改忽略文件
Merge branch 'master' of https://github.com/yuezhongxin/XiShuai

Conflicts:
	.gitignore