homework edits for 9-24
Merge branch 'master' into gh-pages