firt commit
Merge pull request #16 from xz1082/master

Assignment 8