Assignment 11
Merge github.com:mrotmensch/assignment11
Assignment 11
Merge pull request #29 from mrotmensch/master

pull request.