new style on the map
Merge branch 'master' of https://github.com/jonalonn/sounds-sthlm

Conflicts:
	index.html
	js/main.js