trijug github intro talk
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
don't need to show that i ran history command