3.txt
add 1.txt 000
000
111111
Merge branch 'develope'

Conflicts:
	1.txt