New style for map and location pins
Trying to commit my changes
Merge branch 'master' of https://github.com/juueli/FIXSTHML

# By jo posselt
# Via jo posselt
* 'master' of https://github.com/juueli/FIXSTHML:
  I'm committing the code for getting the data from JSON into the list - but only

Conflicts:
	css/style.css
	index.html
	js/main.js