Merge pull request #1 from SharedFriend/master

SharedFriend->emirreo
Merge pull request #2 from SharedFriend/master

full update
멤버필드 추가

aaa
merge 해결

해결
Merge pull request #9 from emirreo/my-master

my-master commit