the linked map
Merge branch 'master' of https://github.com/juueli/FIXSTHLM
Merge branch 'master' of https://github.com/juueli/FIXSTHLM

Conflicts:
	index.html