First commit
Merge pull request #17 from pcl322/master

Assignment 7