1.修改忽略文件规则
Merge branch 'master' of https://github.com/chucklu/Test

Conflicts:
	.gitignore
将本地和远端的代码合并