render video
Merge branch 'master' of https://github.com/fishwsr/FaceAlign

Conflicts:
	FaceLocation/VideoRenderer.cpp
	FaceLocation/VideoRenderer.h