Merge branch 'master' of github.com:kopipejst/html5-css3-circle-music-player

Conflicts:
	js/player.js
Merge branch 'master' of github.com:kopipejst/html5-css3-circle-music-player