first commit
Merge pull request #9 from xz1082/master

Assignment10