Merge conflicts

src/app/_models/user.ts

@@ -1,6 +1,6 @@
+// This interface is only used for login and storing/retreiving JWT from local storage
 export interface User {
     username: string;
     token: string;
-    photoUrl?: string;
     roles: string[];
 }

src/app/_services/member.service.ts

@@ -19,13 +19,9 @@ export class MemberService {
   adminExists() {
     return this.httpClient.get<boolean>(this.baseUrl + 'admin/exists');
   }
-
-  updatePassword(newPassword: string) {
-    // TODO: Implement update password
-  }
-
+  
   deleteMember(username: string) {
-    return this.httpClient.delete(this.baseUrl + 'admin/delete-user?username=' + username);
+    return this.httpClient.delete(this.baseUrl + 'users/delete-user?username=' + username);
   }
 
 }