First commit.
Merge pull request #18 from xz1082/master

Assignment 7