add friends
Merge branch 'make-nice-homepage'