adding percentage
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:USGS-CIDA/CIDA-Viz
andrew's updated yearly stats
Merge branch 'master' of github.com:USGS-CIDA/CIDA-Viz
adding mac ignores and R ignores"
Merge pull request #141 from isuftin/master

Fixed openlayers problems which fixes the panning!
Simplified fire workflow
Fixed #134, data origin
Merge remote-tracking branch 'upstream/master'
Merge pull request #142 from lwinslow-usgs/master

Fixed data source for reservoirs
Merge branch 'master' of github.com:USGS-CIDA/CIDA-Viz
fix to negative res and null capacities
Merge pull request #143 from jread-usgs/master

fixing negative reservoir issue
scroll tweaks
Merge branch 'master' of https://github.com/USGS-CIDA/CIDA-Viz

Conflicts:
	Vizzies/public_html/js/main.js
Merge pull request #145 from thongsav-usgs/master

scroll tweaks
Added hooks for anchor point highlighting
Merge branch 'master' of https://github.com/USGS-CIDA/CIDA-Viz