first commit
Merge https://github.com/MeihaoChen/assignment7
Merge pull request #12 from MeihaoChen/master

Assignment7