。
Merge remote-tracking branch 'origin/master' into branch2

Conflicts:
	branch2.txt