Merge branch 'main' of https://git.cs.usask.ca/esc568/cmpt-370-group-project into main

....idea/libraries/Maven__org_openjfx_javafx_base_mac_16.xml

...a/libraries/Maven__org_openjfx_javafx_controls_mac_16.xml

....idea/libraries/Maven__org_openjfx_javafx_fxml_mac_16.xml

...a/libraries/Maven__org_openjfx_javafx_graphics_mac_16.xml

...rc/main/java/com/example/scheduler_server/UserThread.java

.../main/java/com/example/schedulerapp/AvailabilityView.java

...pp/src/main/java/com/example/schedulerapp/Controller.java

...ulerApp/src/main/java/com/example/schedulerapp/Model.java

...ain/resources/com/example/schedulerapp/addShiftPopup.fxml

...main/resources/com/example/schedulerapp/timeOffPopup.fxml