HW9: Post HW7 merge issues
Merge pull request #10 from threestarsgenius/HW9

HW9: Post HW7 merge issues