Cleanup bad merge artifacts in videojs
Merge pull request #273 from vbortone/feature/videojs

Cleanup bad merge artifacts in videojs