cc2
Merge branch 'master' into Test1

Conflicts:
	file2.txt