File3
Merge branch 'master' into test

Conflicts:
	file3.txt