branch2
Merge branch 'branch2'

Conflicts:
	1.txt
Revert "Merge branch 'branch2'"

This reverts commit b10a228d56ba7613bf490b6cf6fd3a6706613dc8, reversing
changes made to ea58837e3436b4b1420047ac23a43105ae969903.