create a friendship model; migrate table 'friendship' into database
add sidebar "friends" to profile page; add list of all users
change default avatar
create a friendship controller; add friendship routes
add view friends
unit test for friendship model
functional test for friendship controller
integration test
rebase from master; resolve conflicts