1234
коментарий
Merge remote-tracking branch 'origin/new_f2' into new_f

Conflicts:
	kurs/Project1.exe
	kurs/Unit1.dcu