Final deliverables
Merge pull request #5 from BLesnau/hw2

Final deliverables