updated with friendships
Merge branch 'master' of github.com:johnyeung/Shuffle-Chat