starting to add the delete a friend from a list
Merge branch 'master' into settling