Adding fill in the blanks for workshop
Merge branch 'master' into gh-pages