first commit
Merge branch 'master' of github.com:zhangxiaang/CoolWeather_app