Merge pull request #2 from bjurgess1/hw3

Merging hw3 with the master branch