Fleming HW2
Merge pull request #23 from dflemin3/HW2_branch

Fleming HW2