Added line "branch1"
Merge branch 'master' of https://github.com/GuyCleynens/TestGit into branch1

Conflicts:
	test1.txt