updates
links to slides and trickster
Merge remote-tracking branch 'origin/master' into gh-pages