adding and accepting friend works
commit so i can pull
merged results after adding friendships
friendships work, and recognizing friendships in progress
Merge branch 'master' of https://github.com/aivener/bopster
after pull, this is the push