Revised
Merge branch 'master' of github.com:nodename/animator

Conflicts:
	src/cljs/animator/animator.cljs