bug fix
Merge branch 'master' of https://github.com/kevinluosl/noaplayer

Conflicts:
	main.js