WIP friends list
Merge conflict
Removed file that shouldn't be tracked