Some changes
Merge branch 'master' of https://github.com/algor512/Prak-14-2

Conflicts:
	.gitignore
	comb.c