Create 2.txt
Merge branch 'develop2' of https://github.com/meeiyu/test_0704 into develop2

Conflicts:
	2.txt