Removed all diff artefacts.
change #10

clear up all the errors of toolbar; add border to the icon selected;
make the "age groups by census" checked
change #11

add CSV file (function failed to be called)
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar

Conflicts:
	charts/AgeGroupChart.aux
	charts/AgeGroupChart.png
	charts/StudentPopulation.csv
	index.html
	layers.xml
	script/main.js
change # 12

Tasks needed to be done: 1. social network hyperlink; 2. info-window
didn't show up for polygon layer
Merge remote-tracking branch 'origin/master'

Conflicts:
	layers.xml
	script/CSV2JSON.js
	script/main.js
change #12

enable info-window after selecting a polygon
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar

Conflicts:
	index.html
	layers.xml
	script/CSV2JSON.js
	script/main.js
Merge pull request #27 from GretaYi/master

Commits prior to interface meeting.