videojs testing
Merge branch 'master' of https://github.com/kennysong/synematic

Conflicts:
	synematic.js