New Text Document.txt was changed 2 times
My.txt
Merge branch 'new' of https://github.com/AnnaStorozhenko/Ajour into new

Conflicts:
	New Text Document.txt