A local commit
commited from local
Merge branch 'master' of https://github.com/m4yorga/TestRepo

Conflicts:
	New Text Document.txt