merging conflict fixing
Merge branch 'master' of https://github.com/anbadovideo/anbado-player

Conflicts:
	testexample.html