change #7 add time slider
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar

Conflicts:
	index.html
	script/main.js
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar

Conflicts:
	script/main.js