添加忽略的版本控制
Merge branch 'master' of https://github.com/ZhangBohan/jiajiaohello.git

Conflicts:
	.gitignore