getting ready to publish to github
Merge branch 'master' of https://github.com/skasriel/collab