Getting things in place for the new semester
Merge branch 'master' into gh-pages