modified:   src/CountyData.html
	modified:   src/CountyData.js
Merge branch 'master' of https://github.com/jbencook/cs171-ag-viz

Conflicts:
	src/CountyData.js

	modified:   src/CountyData.html
	modified:   src/CountyData.js