third commit master
cleaned
Merge branch 'master' into mybranch

Conflicts:
	testFile.txt