fix follow button
'fix merge conflicts'
Merge branch 'following' of https://github.com/rjmccluskey/lil_twitter into following