Merge branch 'gh-pages' of https://github.com/dsnmin/player

Conflicts:
	base64.js
	player.swf
Merge branch 'gh-pages' of https://github.com/dsnmin/player