# Conflicts:
#	.idea/vcs.xml
#	SchedulerApp/src/main/java/com/example/schedulerapp/RafisWeirdClass.java
#	SchedulerApp/src/main/java/com/example/schedulerapp/ReceiveThread.java
#	SchedulerApp/src/main/java/com/example/schedulerapp/Schedule.java
#	SchedulerApp/target/classes/com/example/schedulerapp/Controller.class
#	SchedulerApp/target/classes/com/example/schedulerapp/Model.class
#	SchedulerApp/target/classes/com/example/schedulerapp/ModelSubscriber.class
#	SchedulerApp/target/classes/com/example/schedulerapp/Schedule.class
#	SchedulerApp/target/classes/com/example/schedulerapp/ScheduleApp.class
#	SchedulerApp/target/classes/com/example/schedulerapp/ScheduleView.class
#	SchedulerApp/target/classes/com/example/schedulerapp/Staff.class
#	SchedulerApp/target/classes/com/example/schedulerapp/addEmployee.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/addShiftPopup.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/editEmployee.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/headerManager.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/login.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/paystubView.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/removeEmployee.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/schedBottomPanelManager.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/schedSidePanel.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/staffManagerSidePanel.fxml

Telling git to ignore the java and maven build files. This should make pulling and pushing a lot easier.

Changed update implementation for employees so rather than sending the whole list of employees when there are staff change, the server sends a message to all active clients to add/remove them locally. Also, changed all exception variable names to 'exception', and cleaned up warnings.

Added test code for creating schedules (adding shifts). Also added sleep statements for the client to receive the server responses. Changed getting the number of employees to the new employeeSize method in the model (should use the correct size now).

Changed print all employees to remove the 'allEmployees' part. And made a function for getting the number of staff.