修正
Merge branch 'master' of https://github.com/ibc-salesio/keijiban

Conflicts:
	nowplaying.js
	style.css