Modify 2.txt
Merge branch 'master' of https://github.com/imianchou/fortest

Conflicts:
	2.txt