add 3.txt
update 2.txt
update 2.txt
update 1.txt
Merge branch 'spiffy_new_feature' into test_merge

Conflicts:
	2.txt
echo 222 in 2.txt
echo 111/aaa in 1.txt
echo aaa/111 in 1.txt
echo 333/ccc in 3.txt
Merge branch 'b1'

Conflicts:
	1.txt