some updates
Merge branch 'bernie' of https://github.com/kochbj/weather-school into bernie

Conflicts:
	modules/weather/scripts.js