changing the scale of the map
merge conflict"
adding map legend
initial commit to osm map
resolving conflicts
Merge branch 'osm_map' into gh-pages