fixing socket
Merge branch 'master' of github.com:AlienHoboken/divvy

Conflicts:
	Model/db.js

fixing merge