Add geoJson
Merge branch 'master' of https://github.com/will0955/leaflet-shiny

Conflicts:
	R/leaflet.R