update 1.txt
update 1.txt
update 2.txt
Merge branch 'testing'

Conflicts:
	1.txt