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

Merged colorbrewer scales
corn prices ($/bu)
setting up time series
time series in box
fixed data
time series and value of field template
removed comment
Merge branch 'master' of https://github.com/jbencook/cs171-ag-viz

Conflicts:
	src/LocalYield_Chad.js

	new file:   data/price.csv
	modified:   src/LocalYield_Chad.html
	modified:   src/LocalYield_Chad.js
Update README.md
	modified:   src/LocalYield_Chad.js
Merge branch 'master' of https://github.com/jbencook/cs171-ag-viz

merged local yield branch
Update README.md
Update CountyData_king.js
Update CountyData_king.js
Update CountyData_king.js
	modified:   src/LocalYield_Chad.html
	modified:   src/LocalYield_Chad.js
	modified:   src/LocalYield_Chad.html
	modified:   src/LocalYield_Chad.js
push
Merge branch 'master' of https://github.com/jbencook/cs171-ag-viz

Conflicts:
	src/CountyData_king.js