some tweaking
Merge branch 'master' of https://github.com/fhacktory/collablock
try some stuff
merge conflicts