update
Merge branch 'master' of https://github.com/elliotstokes/ukmap

Conflicts:
	index.html
updates