(bug) tiny tiny change
(merge) merging branch to master
Merge branch 'feat/update-client-to-play-with-server'
(feat) add shared style to css
(feat) preparing for rebase
(feat) update files after rebase
(feat) add friends and connecting friends functionality to server
Merge pull request #126 from Neco-Murphy/feat/style

(feat) add shared style to css
(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
Merge branch 'feat/friend-requests'
(bug) missing comment
Merge pull request #129 from bace135/debug/multiple-contents

(bug) fix multiple contents
(feat) add google font
(feat) add styles in pending
(feat) add style to pendingView