progress on friends branch
post pull merge
made friends profile consistent with your own
post pull commit