fix for merge
Merge branch 'master' of https://github.com/johannessjoberg/distributedsystems
added some comments and screencast