master modify 4
master modify 5
master modify 6
Merge branch 'master' into develop

Conflicts:
	file2.txt