friendList
merge conflicts
Merge pull request #6 from vasanthykolluri/akash

Akash