NYC Subway & Parks
Merge branch 'PublishedMap' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	img/subway.png
	js/allrailstops.geojson
	js/cdistricts.geojson
	js/lrrlines.geojson
	js/lrrstops.geojson
	js/mnlines.geojson
	js/mnstops.geojson
	js/parks.geojson
	js/sublines.geojson
	js/substops.geojson