Add buddies

https://trello.com/c/bjJNY4Ub/44-users-can-friend-each-other

Some latent code was commented for next PR
Align the parameters of a method call if they span more than one line.