last commit
Merge branch 'master' of https://github.com/samzhang111/schoenberg-visualization

Conflicts:
	timeline/media/css/arcs.css