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

Conflicts:
	src/CountyData_king.js

	new file:   BitFarm Design Studio 3.pdf
	modified:   src/CountyData_king.js
	modified:   src/LocalYield.html