Merge branch 'weather-service' of github.com:tujamaica/vjolivet-web into weather-service
Merge branch 'weather-service' of github.com:tujamaica/vjolivet-web into weather-service