adding foo.cpp
Merge branch 'my_branch'