Added Weather
Merge branch 'master' of https://github.com/jiahanwang/smartpants