first commit
Merge https://github.com/MeihaoChen/assignment7