unique third line in branch test added
Merge branch 'BranchTest' of https://github.com/CMouly/RepoTest

Conflicts:
	TestGitaddFile.txt
unique Fourth line added
Merge branch 'Conflict_solver'

Conflicts:
	TestGitaddFile.txt