Pulling in novice shell lesson changes from swc master
Merge pull request #4 from rbeagrie/cherry-pick-upstream

Pulling in novice shell lesson changes from swc master