partially complete exercise
Merge branch 'master' of https://github.com/jawrainey/cpp