Make information much more clear to students
Merging 'master' into 'gh-pages'