Add note on that students must finish at least one of the optional ones in lab 3
Merging 'master' into 'gh-pages'