Updated cp.cpp
Merge branch 'master' of https://github.com/kle016/rshell-2

Conflicts:
	src/cp.cpp