commited change in branch
Merge branches 'master' and 'testBranch' into testBranch
branch only change
this should be in the new branch
Merge branches 'newBranch' and 'testBranch' into newBranch
Merge branches 'master' and 'newBranch'