fuck
added follow button and stuff
added things
Merge branch 'we-broke-stuff-so-new-branch' into dev_branch

Resolving merge conflict.
resolved merge conflict