working on weather
Merge branch 'master' of https://github.com/peterkhayes/Doorbell

Conflicts:
	app.js