admin users logs html 주간 채널별 신청자
Merge branch 'master' of https://github.com/onsaemiro8318/bday_ohui

Conflicts:
	app/models/user.rb