20_02/ 1 - get buddies
Merge remote-tracking branch 'origin/master'