修改 readme
修改忽略文件
修改忽略文件
edit
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.gitignore