solution and tests
Merge branch 'master' of github.com:snejy/Programming101