nnnn
afasdfsa
Merge branch 'master' of https://github.com/elmagomamer/codeRepo.git

Conflicts:
	newfile.txt
564