Merge branch 'friends'
Add unique constraint to Users
Merge branch 'modeling-users'
Add method 'friend_users' to User model