HW7 update of two problems
Merge branch 'master' of github.com:toddjsch/41201