fourth line
Merge branch 'master' of https://github.com/beks2/git-workshop

Conflicts:
	test.txt