mindre feil
Merge branch 'gh-pages' of https://github.com/Norkart/Webatlas.js-doc into gh-pages

Conflicts:
	3-webatlas.js-markers/js/main.js