增加了功能，程序更加完善
Merge branch 'master' of https://github.com/Martian101/pyweather