Merge branch 'master' of https://github.com/defrid/WeatherInfo into Rikki_(andrew)
Merge branch 'master' of https://github.com/defrid/WeatherInfo into Rikki_(andrew)