Commit assignment 3
Merge pull request #22 from xz1082/master

Commit assignment 3