банк
Merge branch 'origin/master'
ок
Merge branch 'origin/master'

Conflicts:
	DPR/Project.dproj
	SOURCE/MainForm.dfm
	SOURCE/MainForm.pas