modif second branch

first modif in second branch
modif second branch

first modif in second branch
Merge branch 'second_branch' of https://github.com/mironim/Github_repo_test into second_branch

Conflicts:
	test.txt
rebase branch
commit
master = branch_one