HW7
Merge pull request #119 from jtzhanguw/HW7_branch

Hw7 branch