Create users correctly
Merge branch 'arthackday' of http://github.com/Dewb/talk2strangers into arthackday

Conflicts:
	server.js
Merge branch 'arthackday' of http://github.com/Dewb/talk2strangers into arthackday

Conflicts:
	server.js