pull down stuff after lunch
follow button
follow button
fix merge conflicts
Update user.rb
fix follow button
'fix merge conflicts'
Merge branch 'following' of https://github.com/rjmccluskey/lil_twitter into following
Merge pull request #15 from rjmccluskey/following

Following