Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
edited by git extensions
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	test2.txt