re-added commit-basic.txt
Merge branch 'feature-branch-basic'