Revert "branch change added text"

This reverts commit fe5ec5d83fb3f0535d4ec4aec59de34e7a0f50be.
Revert "Revert "branch change added text""

This reverts commit 2e9b9ae74c5a9a6de088a5e77acff2fe7b1aa2de.
Revert "Revert "Revert "branch change added text"""

This reverts commit 62e381539dbdc9a91f4122d2314d0dfb28a55b89.
Merge branch 'master' into testbranch

Conflicts:
	newfile.txt