added text for the master version
heading back to the trunk
Merge branch 'my-first-branch'
C++