Merge branch 'master' of github.com:IvenZ/weatherapp