ashao: HW7 Submission
Merge pull request #121 from ashao/HW7_branch

Hw7 branch