2014-12-03-edinburgh post workshop blog post
Merge pull request #697 from mikej888/2014-12-03-edinburgh-post-blog

2014-12-03-edinburgh post workshop blog post
Another workshop
Merge branch 'master' of github.com:swcarpentry/site
Blog post about Edinburgh workshop