master1
m2
Merge branch 'master' of https://github.com/lukszcz/test

Conflicts:
	test.txt