Commit
Merge pull request #21 from xz1082/master

Assignment 5 X.Zhou