Added the friend object with stick figures
Merge remote-tracking branch 'origin/master'