третий день конец
Merge remote-tracking branch 'origin/master'

Conflicts:
	Win32/Debug/Project3.exe
	Win32/Debug/uGetTest.dcu
	Win32/Debug/uResult.dcu
	Win32/Debug/uSelectTest.dcu
	uGetTest.dfm
	uGetTest.pas
	uMediaPlayer.dfm
	uMediaPlayer.pas
	uResult.dfm