Merge pull request #1 from kentcdodds/master

Fixing thing
Merge branch 'master' into gh-pages