Added rebase text file
Merge branches 'master' and 'feature-branch-rebase'