asd
Merge branch 'master' of https://github.com/nnivan/node.js_test

Conflicts:
	client.js
	server.js
Add: rooms,no all in one, 3 per room