test
more cool stuff
no message
Add esri leaflet!
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js
add back in corey's stuff
no message
Merge branch 'master' of https://github.com/gis-pluggedin/web
add is esri leaflet
Merge remote-tracking branch 'origin/master'
clean up
no message
Merge branch 'master' of https://github.com/gis-pluggedin/web

Conflicts:
	index.html
	js/main.js
Use Esri's leaflet-esri js service
no message
no message
Merge branch 'gh-pages' of https://github.com/gis-pluggedin/web into gh-pages

Conflicts:
	index.html
no message