VideoTest
Merge branch 'master' of https://github.com/lumannnn/AHLS

Conflicts:
	VideoTest/VideoTest/bin/Debug/VideoTest.exe