test1 changed to stage conflict
Merge branch 'master' of https://github.com/borkke/MyTest

Conflicts:
	test1.txt