working in .html in novice shell -- git bizarre
Merge branch 'students' of https://github.com/swcarpentry/2014-04-14-wise into students
merging recent changes from upstream