Adding umbrella handling to weather.
Resolvng merge conflict in app.js