Chris's talk
Merge pull request #80 from scaleconf/chris

Chris's talk