test
add second file
text test1
text test2
test3
Merge branch 'refs/heads/branch3'

Conflicts:
	1 copy 2.rtf
Revert "test3"

This reverts commit b4da553e094a0becda28db112a77a56bbf31ddb6.
test from tower