Added undo and redo on the touch circle UI.

Also, I rewrote history to fix inappropriate merges and to move all commits from master to gh-pages.

Conflicts:

	script.js