Merge branches 'master' and 'solutions'
Avoid generating executable files with a cpp extention.
Merge branch 'master' of https://github.com/jyoder/programming-basics into solutions