[*] test3
[*] Test 4
Merge branch 'master' of github.com:individym/testRep

Conflicts:
	Test.txt
Merge branch 'master' of github.com:individym/testRep