Add note saying that students will have to seek out information on their own as well
Merging 'master' into 'gh-pages'