More work on friending
Merge branch 'master' of https://github.com/dvaughn/Mass-Debate