homework 2
hw2 edits
qMerge remote-tracking branch 'upstream/master
:q
'