Resolved Merge Conflicts.
Created Social tab to search for users and a public profile view to follow the user and see their watchlist and fixed login to add the user to firestore database if they do not exist
Created Social tab to search for users and a public profile view to follow the user and see their watchlist and fixed login to add the user to firestore database if they do not exist
assigned to @ta01157
mentioned in commit 319dd2fb
merged