start making e's and b's deletable
Merge branch 'master' into make-enemyships-and-buddyships-deletable
fixed merge conflict
can delete buddy/enemy relationships
Merge branch 'make-enemyships-and-buddyships-deletable'