poprawka
Merge branch 'master' of https://github.com/wemstar/IMN

Conflicts:
	lab11/utils.cpp
poprawka