Two more workshops
Archiving workshops
Merge branch 'adding-two-workshops'
Merge branch 'master' of github.com:swcarpentry/site