edited cp.cpp to match the one I sent to my partner
Merge branch 'cp' into ls
I believe this is a requirement for submitting lab 5 as a part of hw 1