changed line 2
Merge branch 'master' of https://github.com/toedter/git-test

Conflicts:
	test1.txt