XXXA
lalala
Merge branch 'masterX' of https://github.com/Alexartx/RepoTest into masterX

Conflicts:
	testFile.txt