finished assignment
Merge pull request #106 from wcaplinger/master

finished assignment