(feat) preparing for rebase
(feat) update files after rebase
(feat) add friends and connecting friends functionality to server
(feat) preparing for rebase
(feat) update files after rebase
(feat) add friends and connecting friends functionality to server
Merge branch 'feat/friend-requests' of https://github.com/bace135/thesis into feat/friend-requests
(merge) fixing some merge conflicts
Merge pull request #127 from bace135/feat/friend-requests

(feat) friend requests