Updating app to pull in forecast
Merge branch 'master' of https://github.com/ryantology/FFOSappdays-weather

Conflicts:
	www/js/app.js