Getting ready for the new semester
Merge branch 'master' into gh-pages