2 задача исправлены критические баги
,h
Merge branch 'master' of https://github.com/Mihail-M/Programming_in_university

Conflicts:
	 It looks like you may be committing a merge.