for pull
Merge branch 'master' of github.com:shnellpavel/SPO_labs

Conflicts:
	lab3/a.out
some changes for looks better