for pull
Merge branch 'master' of https://github.com/qinqinwang/SmallWeather
Merge branch 'master' of https://github.com/qinqinwang/SmallWeather
Merge branch 'master' of https://github.com/qinqinwang/SmallWeather
Merge branch 'master' of https://github.com/qinqinwang/SmallWeather
for pull
update conflicts