Extensive Work on Assignment 3
Merge pull request #159 from jayfo/assign3

Extensive Work on Assignment 3