Loop through friends on root page
Removing derelict binding.pry from user model
removed binding
including user model
one more try....
Add User to Devise Edit and New Registration view
Resolve 2 conflicts with friendfeed2 branch
List latest stats of friends on feed and add separate friends list on friends page
Add friends html file
Adjust feed
Merge branch 'gruff_integration'
Add all_users action to user controller
Add all_user path, add all_user view where it lists all users and lets you add them as a friend. Add link from friends list to all_users list.
Merge branch 'master' of https://github.com/krytlewski/fatcamp
Merge friend activity feed, friend list and all users list.