Branching
Added test branch file
Made changes in master branch
Merge branch 'testing'
Merge master and local branch