Módosítva
Merge branch 'proba' of github.com:tenkmilan/Teaching1 into proba

Conflicts:
	text2.txt