It now works with socket.io
Merge remote-tracking branch 'origin/master'

Conflicts:
	model/db.js
Merged db changes