Merge branch 'gh-pages' of https://github.com/xs109107/player
Update index.html
Update index.html
Merge branch 'master' of https://github.com/xs109107/player
Merge branch 'gh-pages' of https://github.com/xs109107/player

Conflicts:
	index.html
	language.xml
	player.js
	player.swf
	player.xml
	share.xml
	style.swf