fixed slide 3
Merge remote-tracking branch 'josh/gh-pages' into gh-pages