file3 added line

put a line in here
Merge branch 'master' of https://github.com/tom4mos/myfirstrepo

Conflicts:
	fileThree.txt