텍스트 수
Merge branch 'master' of https://github.com/onesup/bday_ohui
이미지 수
Merge branch 'master' of https://github.com/minivertising/bday_ohui

Conflicts:
	app/models/message.rb