Added friend info to friend panel
Merge branch 'master' of https://github.com/billdriscoll22/108project