git add .following structure at breakpoint. Use for reference after talking with TA
Following and unfollowing button are now functional. Error commented on in user_controller
Clean up of some helper comments
merge conflict in user.rb