add .
new
Merge branch 'master' of https://github.com/TomSp/test into testBranch1
Merge branch 'master' of https://github.com/TomSp/test into testBranch1
Merge branch 'testBranch1' of https://github.com/TomSp/test

Conflicts:
	t.txt