Submitting HW7
Merge pull request #131 from yixinmao/HW7_branch

Submitting HW7