completed population density choropleth. Need to finish styling changes and add irrigation data. Need to move JSON to own file (currently within main.js). Click events need to bound to buttons.
choropleth color mapping
Merge branch 'master' into Adrienne2

Conflicts:
	public/javascripts/main.js