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

Conflicts:
	NewsProject1/NewsProject1.xcodeproj/project.pbxproj
	NewsProject1/NewsProject1.xcodeproj/project.xcworkspace/xcuserdata/ZhaoJuan.xcuserdatad/UserInterfaceState.xcuserstate
	NewsProject1/NewsProject1.xcodeproj/project.xcworkspace/xcuserdata/quyoumac2.xcuserdatad/UserInterfaceState.xcuserstate
	NewsProject1/NewsProject1.xcodeproj/xcuserdata/ZhaoJuan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	NewsProject1/NewsProject1.xcodeproj/xcuserdata/quyoumac2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	NewsProject1/NewsProject1/AppDelegate.m
	NewsProject1/NewsProject1/ArticleDetailViewController.m
	NewsProject1/NewsProject1/DetailViewController.m
	NewsProject1/NewsProject1/LH_Requester/LH_Requester.m
	NewsProject1/NewsProject1/NewsProject1-Info.plist
	NewsProject1/NewsProject1/ViewController.m