add2
Merge branch 'master' into other_member

Conflicts:
	test.txt