Torsten added line
Merge branch 'test' of https://github.com/flarss/repo3 into test

Conflicts:
	a.txt
Merge branch 'test' of https://github.com/flarss/repo3 into test

Conflicts:
	a.txt
Merge branch 'master' of https://github.com/flarss/repo3
Merge branch 'test'

Conflicts:
	a.txt