develop modify 4
Merge branch 'master' into develop

Conflicts:
	file2.txt
Merge branch 'develop'

Conflicts:
	file2.txt