hahaha
Merge branch 'master' of https://github.com/Nabukodonozor/szlab4.git

Conflicts:
	file.txt