qq
Merge branch 'master' of https://github.com/shiyiyufen/XIAOGANG-4-M

Conflicts:
	NewsProject1/NewsProject1.xcodeproj/project.pbxproj