Merge branch 'master' of github.com:swcarpentry/website
Merge pull request #235 from gvwilson/master

Fixing error messages in utility file.
Blog post about record and playback in the Notebook
Fixing typo in FAQ
Merge branch 'master' into instructors-guide