Animation update

Needs more work
Merge branch 'master' of https://github.com/hoonkong/thegrid

Conflicts:
	JS/app.js
	JS/block.js
	JS/scene.js