start working with socket io
Merge branch 'master' of https://github.com/fhacktory/collablock
commit before merge
merge master
fix socket.io-client dependency
working on the bridge
finish players handling in bridge
resolve very bad conflicts
Merge branch 'master' of https://github.com/fhacktory/collablock