Two more workshops
Added JORS description to project page
Merge remote-tracking branch 'upstream/master'
Merge pull request #683 from npch/master

Added project description and logo for JORS to project page
Archiving workshops
Merge branch 'adding-two-workshops'
Merge branch 'master' of github.com:swcarpentry/site