the mac version of the CppExercise
Merge remote-tracking branch 'upstream/master'