small changes
Merge branch 'master' of https://github.com/YEI-jacob-w/CloudMap
remade friendship model working toward a functioning mutual friendship model.
fixed some conflicts