fixed merge conflicts with main

For Review/.gitkeep

For Review/Working-Agreement-Canvas.docx

Sprint_Plan.docx

What_we_have_been_asked_to_do.docx

build.gradle

...diff/client_project/config/AuthenticationFailHandler.java

...f/client_project/config/AuthenticationSuccessHandler.java

...diff/client_project/config/CustomAccessDeniedHandler.java

...om/cardiff/client_project/config/WebMvcConfiguration.java

.../com/cardiff/client_project/config/WebSecurityConfig.java

...a/com/cardiff/client_project/mapper/SuperAdminMapper.java

...m/cardiff/client_project/service/imp/HospitalService.java

src/main/java/com/cardiff/client_project/utils/Result.java

src/main/resources/static/css/admin.css

src/main/resources/static/css/fault.css

src/main/resources/static/css/mainSupAdminView.css

src/main/resources/static/css/style.css

src/main/resources/static/html/superAdminView.html

src/main/resources/static/img/backgroud3.jpg

src/main/resources/static/img/backpicture.jpg