Cat problem c++
Merge branch 'master' of https://github.com/jdan/cs370-team-programming