bridge header error?
Merge remote-tracking branch 'origin/master'
errors are mostly gone. Now to start testing friends functionality