shenanigans with trying to autoscroll
merge conflicts
Merge branch 'master' of github.com:ilanasufrin/friendStalker into ben_branch