new commit on master after a commit on testing
another change on master
one more before final merge
time to merge
Merge branch 'Testing'

Conflicts:
	yetAnotherFile.txt
Merge branch 'master' into Testing

Conflicts:
	yetAnotherFile.txt