충돌 테슷
Merge branch 'master' of github.com:shiren/sbcamp

Conflicts:
	camp1/js/model/song.js
	css/style.css

충돌 해결
나우플레잉 22
Merge branch 'master' of github.com:shiren/sbcamp