Working map link!
Merge branch 'master' of https://github.com/juueli/FIXSTHML

Conflicts:
	js/main.js