adfasdf
Merge remote-tracking branch 'origin/master'
Can now add friends in profile view