initial commit
Merge branch 'master' of https://github.com/creatologist/custom-videojs

Conflicts:
	README.md