Commit from second client
Merge branch 'master' of https://github.com/rKow/gitTutorial

Conflicts:
	myFile.txt