Merge branch 'combo' into main

SchedulerApp/.idea/encodings.xml

SchedulerApp/.idea/jarRepositories.xml

...aries/Maven__com_google_protobuf_protobuf_java_3_11_4.xml

...ea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml

SchedulerApp/.idea/runConfigurations.xml

SchedulerApp/SchedulerApp.iml

SchedulerApp/pom.xml

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

...rApp/src/main/java/com/example/schedulerapp/Employee.java

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

...rApp/src/main/java/com/example/schedulerapp/Schedule.java

...p/src/main/java/com/example/schedulerapp/ScheduleApp.java

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

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

SchedulerApp/src/main/java/module-info.java

SchedulerApp/src/main/resources/.DS_Store

SchedulerApp/src/main/resources/com/example/.DS_Store

...src/main/resources/com/example/schedulerapp/Untitled.fxml

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

...resources/com/example/schedulerapp/dailySchedManager.fxml