updated server-client
Merge branch 'master' of github.com:joechee/doesntmatter

Conflicts:
	app.js
	public/javascripts/socket.js
	socket/game.js
add interface