throttled update
Merge branch 'master' of github.com:joechee/doesntmatter

Conflicts:
	socket/game.js