add
Merge branch 'master' of https://github.com/RaphaelRong/JJNews

Conflicts:

JJNews.xcodeproj/project.xcworkspace/xcuserdata/ronghao.xcuserdatad/User
InterfaceState.xcuserstate