ok
Merge branch 'master' of https://github.com/wghwang/News_app_aboutHangZhou
Merge branch 'master' of https://github.com/wghwang/News_app_aboutHangZhou