modified:   src/LocalYield_Chad.html
	modified:   src/LocalYield_Chad.js
	modified:   src/LocalYield_Chad.html
	modified:   src/LocalYield_Chad.js
added value of field
	modified:   src/LocalYield_Chad.html
	modified:   src/LocalYield_Chad.js
Merge branch 'chad'

merging local_yield changes
Merge branch 'master' of https://github.com/jbencook/cs171-ag-viz

merging local_yield changes
adding monthly averages
	deleted:    src/CountyData_Chad.html
	deleted:    src/CountyData_Chad.js
	modified:   src/LocalYield.html
	modified:   src/LocalYield.js
	deleted:    src/LocalYield_Chad.html
	deleted:    src/LocalYield_Chad.js
Merge branch 'master' of https://github.com/jbencook/cs171-ag-viz

merged changes
ryan
Design Studio

design studio 3
Merge remote-tracking branch 'origin/boss'
link to county data
Merge branch 'master' of https://github.com/jbencook/cs171-ag-viz
	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
todo list done
moving localyield