PERFECT RUN: 0 ERRORS, 0 LEAKS
Fixed merge conflicts
Merge branch 'master' of https://github.com/jensa/cplusplus