Merge pull request #2 from bcaffo/gh-pages

Merging from gh-pages
Added a bunch of content to the current talk