updated Makefile and cp.cpp
Merge pull request #1 from bchen022/master

updated Makefile and cp.cpp
fixing merge conflict