started friends feature
fix merge
Merge pull request #5 from 12days/friends

started friends feature