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

Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/ckplayer/player