不知什么文件
创建了个plist
添加了值
youyou remove
忽略
Removed file that shouldn't be tracked
添加了个头像
Removed file that shouldn't be tracked
添加了图片2222
Merge branch 'addXibBranch' into plist后再添加图片
Merge branch 'master' into plist后再添加图片

Conflicts:
	gitGIT/gitGIT.xcodeproj/project.pbxproj
准备2次合并？
添加了a的方法