konflikt
Merge branch 'master' of https://github.com/mTrych/repo

Conflicts:
	cos.txt