Add note about having to also complete one optional exercise per block
Merging 'master' into 'gh-pages'