complete all but part 2
Merge branch 'master' into homework