Version without an array
Merge branch 'master' of github.com:jamesfielder/adventures-in-learning-cpp