modified:   kostya/vagon.pas
Merge branch 'master' of https://github.com/Dispetcher14/torg

Conflicts:
	kostya/vagon.pas

	modified:   kostya/vagon.pas