Add friend work in progress
Merge branch 'master' of https://github.com/cs307-team13/scry
Merge branch 'master' of https://github.com/cs307-team13/scry