homework 2
hw2 edits
Merge remote-tracking branch 'upstream/master'