hw 2
Merge pull request #42 from jefarrell/master

HW 2