from test2
Merge remote-tracking branch 'origin'

Conflicts:
	test2.txt