commit at master cp.cpp to labpartner
Merge pull request #3 from tassoeb/master

commit at master cp.cpp to labpartner
Merge branch 'master' into ls