add logging
Merge branch 'master' of github.com:christopherdcunha/collaboration-backend
move socket stuff around