change #9

Timeslider (GCAMP)
除了逗逼再没有别的想法了

除了逗逼再没有别的想法了
Merge branch 'master' of https://github.com/GretaYi/AtlStreetcar

Conflicts:
	charts/Thumbs.db
	images/Thumbs.db
	images/backward.png
	images/forward.png
	images/glyphicons_015_print.png
	images/glyphicons_054_clock.png
	images/glyphicons_186_move.png
	images/glyphicons_216_circle_arrow_left.png
	images/glyphicons_217_circle_arrow_right.png
	images/glyphicons_236_zoom_in.png
	images/glyphicons_237_zoom_out.png
	index.html
	print.js
	script/main.js
	style.css
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Deleted system-created thumbs.db
Merge pull request #26 from GretaYi/master

Coordinated with Li's local repo