first commit
Merge pull request #8 from MeihaoChen/master

Assignment 6