refactoring on the road
Merge branch 'master' of https://github.com/fhacktory/collablock