Added file
New line at top on master branch
Merge branch 'master' into feature/my-new-branch

Conflicts:
	myFile.txt