update
update:
update
Merge branch 'greg' of https://github.com/sang4441/ece
Patient record changed
update
update
update
update
merged. Doctor can edit appointments and differentiate initial and subsequent using AppointmentService. Changed StaffController.appointmentFormSubmit to use service logic. double check
Merge branch 'master' of https://github.com/sang4441/ece

Conflicts:
	src/main/webapp/WEB-INF/pages/patient/profile.jsp