weatherFix
Merge branch 'master' of github.com:Creego/team1