事实上
Merge branch 'master' of https://github.com/tufu/weifengnews

Conflicts:
	.DS_Store

weifengnews/weifengnews.xcodeproj/project.xcworkspace/xcuserdata/ibokan.
xcuserdatad/UserInterfaceState.xcuserstate