17_02/ 3 - finish with addBuddy
17_02/ 5 − 67 fixed
17_02/ 5 − 78
Merge remote-tracking branch 'origin/master'