Removes subscriptions table, adds stalking column to friendships, adds stalking conditional to friends show page
Merges conflict in friend model
Merge pull request #47 from ilanasufrin/ben_branch

Ben branch