at last - txtrepo2 commit
Merge https://github.com/g4rden/txtrepo

Conflicts:
	merge_testing.txt