merge from working
Merge branch 'master' of github.com:investigate/sceptical-climate

Conflicts:
	index.html