added chat back in, now with rooms
Merge branch 'master' of github.com:ehaughee/collabit