Finish homework 7
Merge pull request #117 from tomyun/HW7_branch

Homework 7