friends styling
more friends
changes
Merge branch 'master' into brumdebug