WORKING
Merge branch 'DataDisplayPerCounty'

Conflicts:
	js/main.js