Merge branch 'gh-pages' of https://github.com/azepeda2/DataVisualizationProject into gh-pages

Conflicts:
UCISindex.html
data/map.csv
data/top50with5categoriesSP.csv
flowers.csv
javascripts/map.js
javascripts/scatterplotMatrix.js
json/us.json
tester.html
Update Map
Merge branch 'gh-pages' of https://github.com/azepeda2/DataVisualizationProject into gh-pages

Conflicts:
	UCISindex.html
	data/map.csv
	data/top50with5categoriesSP.csv
	flowers.csv
	javascripts/map.js
	javascripts/scatterplotMatrix.js
	json/us.json
	tester.html