Merge pull request #26 from GretaYi/master

Coordinated with Li's local repo
.
Merge pull request #27 from GretaYi/master

Commits prior to interface meeting.
Update CSV2JSON.js
Update main.js
Update index.html
Update layers.xml
Update main.js
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar into GretaYi-master

Conflicts:
	script/main.js
Merge branch 'GretaYi-master'
Merge branch 'master' of https://github.com/DVAlhadeff/AtlStreetcar into DVAlhadeff-master

Conflicts:
	layers.xml
	script/main.js
Merge branch 'DVAlhadeff-master'