Clean up
Merge branch 'master' of github.com:arrannyc/Cplusplus-Basics