测试：视频与截图

Conflicts:
	video_canvas_demo.html
Merge branch 'master' of https://github.com/prgg/code
Merge branch 'master' of https://github.com/prgg/code