更新
Merge branch 'v1.0' of https://github.com/Ireoo/video into v1.0

Conflicts:
	.idea/workspace.xml