Weather report 06 Nov 2014 17:53:10
Merge branch 'gh-pages' of github.com:chrisramsay/weather-report into gh-pages

Conflicts:
	data/soiltemps_all.json