music n stuff
Merge branch 'master' of https://github.com/contingent/shake

Conflicts:
	anim.js