weather experiment
Merge branch 'master' of https://github.com/ColCarroll/ColCarroll.github.io

Conflicts:
	js/app.js