Change best friend
Merge branch 'master' of https://github.com/zedwarth/our-friends

Conflicts:
	best_friend.txt

Merge files