friend functionality completed
commiting merged changes