텍스트 수
Merge branch 'master' of https://github.com/minivertising/kdc_youtube

Conflicts:
	app/assets/javascripts/phone.js.erb