add new file test3.txt
add test4.txt and modify test.txt
add new file test2.txt
modified test2.txt
Merge branch 'test_branch' of https://github.com/rsarafin/labrepo into test_branch

Conflicts:
	test2.txt