made c++ project
merging