Signed-off-by: squarepp2 <ashida6@gmail.com>
Merge branch 'master' of https://github.com/squarepp2/MusicPlayer.git

Conflicts:
	MusicPlayer/src/js/AudioControl.js