asdas
Merge branch 'master' of https://github.com/mateusz-skala/tst

Conflicts:
	tmp1.txt