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

Conflicts:
	src/LocalYield.html

	new file:   BitFarmProcessNotebook.pdf
	modified:   README.md
	modified:   data/gdd.json
	deleted:    data/gdd_small.json
	modified:   index.html
	renamed:    src/CountyData_king.html -> src/CountyData.html
	modified:   src/CountyData.js
	deleted:    src/CountyData_king.js
	deleted:    src/LocalAndCounty.html
	deleted:    src/LocalAndCounty.js
	modified:   src/LocalYield.html