second commit
second
Merge branch 'master' of https://github.com/AsenNikolov80/Homework--C--Advanced-Topics

Conflicts:
	proba.txt