Merge branch 'master' of https://github.com/zirubak/learnCAlgorithm-

Conflicts:
	main.c
Merge branch 'master' of https://github.com/zirubak/learnCAlgorithm-