Instructor updates.
05 changes.
Merge remote-tracking branch 'rosebud/master'

Merging repo from class 6/12.