progress corresponds to http://plomaproject.tumblr.com/post/89809601740

Conflicts:
	js/hybrid-drawing.js
	js/replay.js
	replay.html