x
Merge branch 'gh-pages' of https://github.com/dizzyn/test-map into gh-pages

Conflicts:
	js/data.js