更新
Merge branch 'master' of https://github.com/Nothing-Matter/weifengnews

Conflicts:
	.DS_Store
	Weifengnews/.DS_Store
	Weifengnews/Weifengnews.xcodeproj/project.pbxproj

Weifengnews/Weifengnews.xcodeproj/project.xcworkspace/xcuserdata/ibokan.
xcuserdatad/UserInterfaceState.xcuserstate
	Weifengnews/Weifengnews/AppDelegate.m
gddddeed