assignment 2 --KW
Merge pull request #43 from karlward/master

assignment 2 --KW