Add Marc Shapiro's talk from 2011
Merge pull request #12 from seancribbs/patch-1

Add Marc Shapiro's talk from 2011