Another workshop
Merge branch 'master' of github.com:swcarpentry/site
Blog post about Edinburgh workshop