나우플레잉 목업 시안 2
Merge branch 'master' of github.com:shiren/sbcamp

Conflicts:
	camp1/js/viewc/nowplaying.js

컴플릭 해결