video-editor

Update 3
Merge branch 'master' of https://github.com/lenchv/video-editor

Conflicts:
	README.md