added line2
Merge branch 'master' of github.com:aberezin/test

Conflicts:
	foo.txt