friends page added
merge conflicts addressed