The new type now immediately appears after making it. However, when a new type is created using the menu, it makes a duplicate practitioner. Going to try and fix that.
Deleting docs. Attempting to pull.
Merge branch 'master' of https://github.com/luyuzheng/IFC-Scheduler

Conflicts:
	IFC_Source_Code/src/IFC_v2.2.jar
	IFC_Source_Code/src/build.xml
	IFC_Source_Code/src/build/classes/Manifest.txt
	IFC_Source_Code/src/data/data_012012.txt
	IFC_Source_Code/src/data/data_012013.txt
	IFC_Source_Code/src/data/data_022012.txt
	IFC_Source_Code/src/data/data_032012.txt
	IFC_Source_Code/src/data/data_042012.txt
	IFC_Source_Code/src/data/data_052012.txt
	IFC_Source_Code/src/data/data_062012.txt
	IFC_Source_Code/src/data/data_072012.txt
	IFC_Source_Code/src/data/data_082012.txt
	IFC_Source_Code/src/data/data_092012.txt
	IFC_Source_Code/src/data/data_102012.txt
	IFC_Source_Code/src/data/data_112011.txt
	IFC_Source_Code/src/data/data_112012.txt
	IFC_Source_Code/src/data/data_122011.txt
	IFC_Source_Code/src/data/data_122012.txt
	IFC_Source_Code/src/data/pat.txt
	IFC_Source_Code/src/data/prac.txt
	IFC_Source_Code/src/data/type.txt
	IFC_Source_Code/src/doc.zip
	IFC_Source_Code/src/doc/Main.html
	IFC_Source_Code/src/doc/allclasses-frame.html
	IFC_Source_Code/src/doc/allclasses-noframe.html
	IFC_Source_Code/src/doc/backend/DataService/DataService.Day.html
	IFC_Source_Code/src/doc/backend/DataService/DataService.html
	IFC_Source_Code/src/doc/backend/DataService/DataServiceImpl.html
	IFC_Source_Code/src/doc/backend/DataService/class-use/DataService.Day.html
	IFC_Source_Code/src/doc/backend/DataService/class-use/DataService.html
	IFC_Source_Code/src/doc/backend/DataService/class-use/DataServiceImpl.html
	IFC_Source_Code/src/doc/backend/DataService/package-frame.html
	IFC_Source_Code/src/doc/backend/DataService/package-summary.html
	IFC_Source_Code/src/doc/backend/DataService/package-tree.html
	IFC_Source_Code/src/doc/backend/DataService/package-use.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/AbstractDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/AppointmentDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/DayDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/NoShowDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/PatientDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/PractitionerDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/SchedulePractitionerDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/TypeDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/WaitlistDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/class-use/AbstractDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/class-use/AppointmentDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/class-use/DayDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/class-use/NoShowDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/class-use/PatientDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/class-use/PractitionerDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/class-use/SchedulePractitionerDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/class-use/TypeDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/class-use/WaitlistDto.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/package-frame.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/package-summary.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/package-tree.html
	IFC_Source_Code/src/doc/backend/DataTransferObjects/package-use.html
	IFC_Source_Code/src/doc/class-use/Main.html
	IFC_Source_Code/src/doc/constant-values.html
	IFC_Source_Code/src/doc/data/Appointment.html
	IFC_Source_Code/src/doc/data/Constants.html
	IFC_Source_Code/src/doc/data/Date.html
	IFC_Source_Code/src/doc/data/Day.html
	IFC_Source_Code/src/doc/data/DayLoader.html
	IFC_Source_Code/src/doc/data/DaySaver.html
	IFC_Source_Code/src/doc/data/Patient.html
	IFC_Source_Code/src/doc/data/PhoneNumber.html
	IFC_Source_Code/src/doc/data/Practitioner.html
	IFC_Source_Code/src/doc/data/Room.html
	IFC_Source_Code/src/doc/data/Time.html
	IFC_Source_Code/src/doc/data/TimeSlot.html
	IFC_Source_Code/src/doc/data/Type.html
	IFC_Source_Code/src/doc/data/WaitingPatient.html
	IFC_Source_Code/src/doc/data/class-use/Appointment.html
	IFC_Source_Code/src/doc/data/class-use/Constants.html
	IFC_Source_Code/src/doc/data/class-use/Date.html
	IFC_Source_Code/src/doc/data/class-use/Day.html
	IFC_Source_Code/src/doc/data/class-use/DayLoader.html
	IFC_Source_Code/src/doc/data/class-use/DaySaver.html
	IFC_Source_Code/src/doc/data/class-use/Patient.html
	IFC_Source_Code/src/doc/data/class-use/PhoneNumber.html
	IFC_Source_Code/src/doc/data/class-use/Practitioner.html
	IFC_Source_Code/src/doc/data/class-use/Room.html
	IFC_Source_Code/src/doc/data/class-use/Time.html
	IFC_Source_Code/src/doc/data/class-use/TimeSlot.html
	IFC_Source_Code/src/doc/data/class-use/Type.html
	IFC_Source_Code/src/doc/data/class-use/WaitingPatient.html
	IFC_Source_Code/src/doc/data/managers/DefaultManager.html
	IFC_Source_Code/src/doc/data/managers/FileManager.html
	IFC_Source_Code/src/doc/data/managers/PatientManager.html
	IFC_Source_Code/src/doc/data/managers/PractitionerManager.html
	IFC_Source_Code/src/doc/data/managers/SearchManager.html
	IFC_Source_Code/src/doc/data/managers/TypeManager.html
	IFC_Source_Code/src/doc/data/managers/WaitlistManager.html
	IFC_Source_Code/src/doc/data/managers/class-use/DefaultManager.html
	IFC_Source_Code/src/doc/data/managers/class-use/FileManager.html
	IFC_Source_Code/src/doc/data/managers/class-use/PatientManager.html
	IFC_Source_Code/src/doc/data/managers/class-use/PractitionerManager.html
	IFC_Source_Code/src/doc/data/managers/class-use/SearchManager.html
	IFC_Source_Code/src/doc/data/managers/class-use/TypeManager.html
	IFC_Source_Code/src/doc/data/managers/class-use/WaitlistManager.html
	IFC_Source_Code/src/doc/data/managers/package-frame.html
	IFC_Source_Code/src/doc/data/managers/package-summary.html
	IFC_Source_Code/src/doc/data/managers/package-tree.html
	IFC_Source_Code/src/doc/data/managers/package-use.html
	IFC_Source_Code/src/doc/data/package-frame.html
	IFC_Source_Code/src/doc/data/package-summary.html
	IFC_Source_Code/src/doc/data/package-tree.html
	IFC_Source_Code/src/doc/data/package-use.html
	IFC_Source_Code/src/doc/deprecated-list.html
	IFC_Source_Code/src/doc/gui/Constants.html
	IFC_Source_Code/src/doc/gui/DateTimeUtils.html
	IFC_Source_Code/src/doc/gui/TimeSlot.html
	IFC_Source_Code/src/doc/gui/class-use/Constants.html
	IFC_Source_Code/src/doc/gui/class-use/DateTimeUtils.html
	IFC_Source_Code/src/doc/gui/class-use/TimeSlot.html
	IFC_Source_Code/src/doc/gui/main/AppointmentBlock.html
	IFC_Source_Code/src/doc/gui/main/AppointmentConfirmationPane.AppointmentConfirmationTableModel.html
	IFC_Source_Code/src/doc/gui/main/AppointmentConfirmationPane.html
	IFC_Source_Code/src/doc/gui/main/AppointmentPanel.html
	IFC_Source_Code/src/doc/gui/main/AppointmentSubpanel.html
	IFC_Source_Code/src/doc/gui/main/DatePicker.html
	IFC_Source_Code/src/doc/gui/main/DayBlock.html
	IFC_Source_Code/src/doc/gui/main/DayPanel.html
	IFC_Source_Code/src/doc/gui/main/EmptyDayPanel.html
	IFC_Source_Code/src/doc/gui/main/HeadingPanel.html
	IFC_Source_Code/src/doc/gui/main/MainWindow.html
	IFC_Source_Code/src/doc/gui/main/Menu.html
	IFC_Source_Code/src/doc/gui/main/MonthHeadingPanel.html
	IFC_Source_Code/src/doc/gui/main/MonthPanel.html
	IFC_Source_Code/src/doc/gui/main/MonthView.html
	IFC_Source_Code/src/doc/gui/main/PanelButton.html
	IFC_Source_Code/src/doc/gui/main/RoomPanel.html
	IFC_Source_Code/src/doc/gui/main/RoomSubpanel.EmptyBlock.html
	IFC_Source_Code/src/doc/gui/main/RoomSubpanel.html
	IFC_Source_Code/src/doc/gui/main/SearchPane.AppointmentResultsTableModel.html
	IFC_Source_Code/src/doc/gui/main/SearchPane.ButtonListener.html
	IFC_Source_Code/src/doc/gui/main/SearchPane.EmptyResultsTableModel.html
	IFC_Source_Code/src/doc/gui/main/SearchPane.PatientResultsTableModel.html
	IFC_Source_Code/src/doc/gui/main/SearchPane.PractitionerResultsTableModel.html
	IFC_Source_Code/src/doc/gui/main/SearchPane.html
	IFC_Source_Code/src/doc/gui/main/SidePanel.html
	IFC_Source_Code/src/doc/gui/main/TimeHeading.html
	IFC_Source_Code/src/doc/gui/main/TimesPanel.html
	IFC_Source_Code/src/doc/gui/main/TinyDayBlock.html
	IFC_Source_Code/src/doc/gui/main/TinyMonthHeadingPanel.html
	IFC_Source_Code/src/doc/gui/main/WaitListPane.BoxListener.html
	IFC_Source_Code/src/doc/gui/main/WaitListPane.WaitlistTableModel.html
	IFC_Source_Code/src/doc/gui/main/WaitListPane.html
	IFC_Source_Code/src/doc/gui/main/class-use/AppointmentBlock.html
	IFC_Source_Code/src/doc/gui/main/class-use/AppointmentConfirmationPane.AppointmentConfirmationTableModel.html
	IFC_Source_Code/src/doc/gui/main/class-use/AppointmentConfirmationPane.html
	IFC_Source_Code/src/doc/gui/main/class-use/AppointmentPanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/AppointmentSubpanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/DatePicker.html
	IFC_Source_Code/src/doc/gui/main/class-use/DayBlock.html
	IFC_Source_Code/src/doc/gui/main/class-use/DayPanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/EmptyDayPanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/HeadingPanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/MainWindow.html
	IFC_Source_Code/src/doc/gui/main/class-use/Menu.html
	IFC_Source_Code/src/doc/gui/main/class-use/MonthHeadingPanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/MonthPanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/MonthView.html
	IFC_Source_Code/src/doc/gui/main/class-use/PanelButton.html
	IFC_Source_Code/src/doc/gui/main/class-use/RoomPanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/RoomSubpanel.EmptyBlock.html
	IFC_Source_Code/src/doc/gui/main/class-use/RoomSubpanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/SearchPane.AppointmentResultsTableModel.html
	IFC_Source_Code/src/doc/gui/main/class-use/SearchPane.ButtonListener.html
	IFC_Source_Code/src/doc/gui/main/class-use/SearchPane.EmptyResultsTableModel.html
	IFC_Source_Code/src/doc/gui/main/class-use/SearchPane.PatientResultsTableModel.html
	IFC_Source_Code/src/doc/gui/main/class-use/SearchPane.PractitionerResultsTableModel.html
	IFC_Source_Code/src/doc/gui/main/class-use/SearchPane.html
	IFC_Source_Code/src/doc/gui/main/class-use/SidePanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/TimeHeading.html
	IFC_Source_Code/src/doc/gui/main/class-use/TimesPanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/TinyDayBlock.html
	IFC_Source_Code/src/doc/gui/main/class-use/TinyMonthHeadingPanel.html
	IFC_Source_Code/src/doc/gui/main/class-use/WaitListPane.BoxListener.html
	IFC_Source_Code/src/doc/gui/main/class-use/WaitListPane.WaitlistTableModel.html
	IFC_Source_Code/src/doc/gui/main/class-use/WaitListPane.html
	IFC_Source_Code/src/doc/gui/main/listeners/AppointmentConfirmationListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/DisplayPatientSearchListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/NewPatientListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/NewPractitionerListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/ScheduleWaitlistPatientListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/SearchListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/WaitlistPatientListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/class-use/AppointmentConfirmationListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/class-use/DisplayPatientSearchListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/class-use/NewPatientListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/class-use/NewPractitionerListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/class-use/ScheduleWaitlistPatientListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/class-use/SearchListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/class-use/WaitlistPatientListener.html
	IFC_Source_Code/src/doc/gui/main/listeners/package-frame.html
	IFC_Source_Code/src/doc/gui/main/listeners/package-summary.html
	IFC_Source_Code/src/doc/gui/main/listeners/package-tree.html
	IFC_Source_Code/src/doc/gui/main/listeners/package-use.html
	IFC_Source_Code/src/doc/gui/main/package-frame.html
	IFC_Source_Code/src/doc/gui/main/package-summary.html
	IFC_Source_Code/src/doc/gui/main/package-tree.html
	IFC_Source_Code/src/doc/gui/main/package-use.html
	IFC_Source_Code/src/doc/gui/package-frame.html
	IFC_Source_Code/src/doc/gui/package-summary.html
	IFC_Source_Code/src/doc/gui/package-tree.html
	IFC_Source_Code/src/doc/gui/package-use.html
	IFC_Source_Code/src/doc/gui/sub/AddToWaitlistUI.html
	IFC_Source_Code/src/doc/gui/sub/ChangePriorityUI.html
	IFC_Source_Code/src/doc/gui/sub/DefaultTimeslotsUI.html
	IFC_Source_Code/src/doc/gui/sub/DisplayAppointmentConfirmationUI.html
	IFC_Source_Code/src/doc/gui/sub/DisplayAppointmentSearchUI.html
	IFC_Source_Code/src/doc/gui/sub/DisplayPatientSearchUI.FutureAppointmentsTableModel.html
	IFC_Source_Code/src/doc/gui/sub/DisplayPatientSearchUI.html
	IFC_Source_Code/src/doc/gui/sub/DisplayPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/DisplayWaitingPatientUI.ApptTableModel.html
	IFC_Source_Code/src/doc/gui/sub/DisplayWaitingPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/EditAppointmentUI.html
	IFC_Source_Code/src/doc/gui/sub/EditPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/EditPatientsUI.html
	IFC_Source_Code/src/doc/gui/sub/EditPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/EditPractitionersUI.html
	IFC_Source_Code/src/doc/gui/sub/HelpUI.html
	IFC_Source_Code/src/doc/gui/sub/NewPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/NewPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/NewTypeUI.html
	IFC_Source_Code/src/doc/gui/sub/SearchForAppointmentUI.html
	IFC_Source_Code/src/doc/gui/sub/SearchForPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/SearchForPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/SelectPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/SelectPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/SelectTimeSlotUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/AddToWaitlistUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/ChangePriorityUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/DefaultTimeslotsUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/DisplayAppointmentConfirmationUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/DisplayAppointmentSearchUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/DisplayPatientSearchUI.FutureAppointmentsTableModel.html
	IFC_Source_Code/src/doc/gui/sub/class-use/DisplayPatientSearchUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/DisplayPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/DisplayWaitingPatientUI.ApptTableModel.html
	IFC_Source_Code/src/doc/gui/sub/class-use/DisplayWaitingPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/EditAppointmentUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/EditPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/EditPatientsUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/EditPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/EditPractitionersUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/HelpUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/NewPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/NewPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/NewTypeUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/SearchForAppointmentUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/SearchForPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/SearchForPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/SelectPatientUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/SelectPractitionerUI.html
	IFC_Source_Code/src/doc/gui/sub/class-use/SelectTimeSlotUI.html
	IFC_Source_Code/src/doc/gui/sub/package-frame.html
	IFC_Source_Code/src/doc/gui/sub/package-summary.html
	IFC_Source_Code/src/doc/gui/sub/package-tree.html
	IFC_Source_Code/src/doc/gui/sub/package-use.html
	IFC_Source_Code/src/doc/help-doc.html
	IFC_Source_Code/src/doc/index-files/index-1.html
	IFC_Source_Code/src/doc/index-files/index-10.html
	IFC_Source_Code/src/doc/index-files/index-11.html
	IFC_Source_Code/src/doc/index-files/index-12.html
	IFC_Source_Code/src/doc/index-files/index-13.html
	IFC_Source_Code/src/doc/index-files/index-14.html
	IFC_Source_Code/src/doc/index-files/index-15.html
	IFC_Source_Code/src/doc/index-files/index-16.html
	IFC_Source_Code/src/doc/index-files/index-17.html
	IFC_Source_Code/src/doc/index-files/index-18.html
	IFC_Source_Code/src/doc/index-files/index-19.html
	IFC_Source_Code/src/doc/index-files/index-2.html
	IFC_Source_Code/src/doc/index-files/index-20.html
	IFC_Source_Code/src/doc/index-files/index-21.html
	IFC_Source_Code/src/doc/index-files/index-3.html
	IFC_Source_Code/src/doc/index-files/index-4.html
	IFC_Source_Code/src/doc/index-files/index-5.html
	IFC_Source_Code/src/doc/index-files/index-6.html
	IFC_Source_Code/src/doc/index-files/index-7.html
	IFC_Source_Code/src/doc/index-files/index-8.html
	IFC_Source_Code/src/doc/index-files/index-9.html
	IFC_Source_Code/src/doc/index.html
	IFC_Source_Code/src/doc/overview-frame.html
	IFC_Source_Code/src/doc/overview-summary.html
	IFC_Source_Code/src/doc/overview-tree.html
	IFC_Source_Code/src/doc/package-frame.html
	IFC_Source_Code/src/doc/package-list
	IFC_Source_Code/src/doc/package-summary.html
	IFC_Source_Code/src/doc/package-tree.html
	IFC_Source_Code/src/doc/package-use.html
	IFC_Source_Code/src/doc/resources/background.gif
	IFC_Source_Code/src/doc/resources/inherit.gif
	IFC_Source_Code/src/doc/resources/tab.gif
	IFC_Source_Code/src/doc/resources/titlebar.gif
	IFC_Source_Code/src/doc/resources/titlebar_end.gif
	IFC_Source_Code/src/doc/serialized-form.html
	IFC_Source_Code/src/doc/stylesheet.css
	IFC_Source_Code/src/nbproject/build-impl.xml
	IFC_Source_Code/src/nbproject/genfiles.properties
	IFC_Source_Code/src/nbproject/private/private.properties
	IFC_Source_Code/src/nbproject/private/private.xml
	IFC_Source_Code/src/nbproject/project.properties
	IFC_Source_Code/src/nbproject/project.xml