Initial Commit
test video merge
Merge branch 'master' of github.com:zangqilong/VideoMerge