Updated with color
Updated with color
Merge branch 'master' of https://github.com/maddenpj/ChicagoHackathon

Conflicts:
	green_roofs.geojson