Intermediate commit
Merge branch 'dev' of https://github.com/KyleLH/collabreate-node into dev