test
adding new base map
adding geojson file
Merge branch 'andyWorking' into gh-pages

Conflicts:
	readme.md
	script.js