Styling for GeoJSON complete
Merge pull request #31 from lwinslow-usgs/master

geoJSON for reservoirs
Merge branch 'master' of https://github.com/USGS-CIDA/CIDA-Viz

Conflicts:
	Vizzies/public_html/js/main.js
Merge pull request #30 from isuftin/master

Styling for GeoJSON complete
Moved drought styling to own function outside of layer
Merge pull request #32 from isuftin/master

Moved drought styling to own function outside of layer
Text block tweaks..
Merge pull request #33 from mhines-usgs/master

Text block tweaks..
improvement on churn code. run all dates
Remove monthly fire data
up to 2000
Merge remote-tracking branch 'upstream/master'
Now going through time steps to load layers
Merge pull request #35 from isuftin/master

Now going through time steps to load layers
whoops, wrong start date
Merge pull request #36 from jread-usgs/master

adding up to date res time series json
updated json res file
Merge pull request #37 from eread-usgs/master

updated json res file
removing SJT res, which has no data anyway
adding drought data info