Initial commit
-изменения1
Merge remote-tracking branch 'origin/master' into delphi
--изменения1
-1
Merge remote-tracking branch 'origin/delphi' into new_f2

Conflicts:
	kurs/Unit1.~pas