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

Conflicts:
	src/CountyData.js

	modified:   README.md
	new file:   css/bootstrap-theme.css
	new file:   css/bootstrap-theme.css.map
	new file:   css/bootstrap-theme.min.css
	new file:   css/bootstrap.css
	new file:   css/bootstrap.css.map
	new file:   css/bootstrap.min.css
	new file:   css/bootswatch.min.css
	new file:   css/pygments.css
	deleted:    data/area-yield_03312014.csv
	new file:   data/area-yield_04042014.csv
	new file:   data/local-yield_04042014.csv
	new file:   data/nebraska.geojson
	new file:   fonts/glyphicons-halflings-regular.eot
	new file:   fonts/glyphicons-halflings-regular.svg
	new file:   fonts/glyphicons-halflings-regular.ttf
	new file:   fonts/glyphicons-halflings-regular.woff
	modified:   index.html
	new file:   libs/bootstrap.js
	new file:   libs/bootstrap.min.js
	new file:   libs/bootswatch.js
	new file:   libs/bsa.js
	deleted:    src/CountyData.js
	new file:   src/LocalYield.html
	new file:   src/LocalYield.js
	src/CountyData_Chad.html
	src/CountyData_Chad.js
	new file:   src/CountyData.js