First Commit
Finished
Merge pull request #16 from pcl322/master

Assignment 11