Integrate clientjs with gamestate
Merge branch 'master' of github.com:joechee/doesntmatter

Conflicts:
	views/play.jade