friend 기능 merge 전
!! before friend merge !
Merge remote-tracking branch 'origin/maymay'
merged with maymay