before merge
getting weather
Merge branch 'master' of github.com:AshleighC/purplerain