First commit.
Second commit
Merge pull request #21 from xz1082/master

Assignment 6