Merge branch 'brian-dev'
added line of code
Merge branch 'dev-brian'
Merge branch 'master' of https://github.com/echowoods/brian-weather