obligatory first program
Merge branch 'master' of https://github.com/Rodlikespants/learncpp

merging