login
login
resolved
working search with information and date format
Merge branch 'master' of https://github.com/sang4441/ece
Merge branch 'greg' of https://github.com/sang4441/ece

Conflicts:
	src/main/java/com/springapp/mvc/dao/AppointmentDAO.java
	src/main/webapp/WEB-INF/pages/doctor/appointment_search.jsp
access rights in patient/staff
Merge branch 'master' of https://github.com/sang4441/ece

Conflicts:
	src/main/java/com/springapp/mvc/controller/StaffController.java
small bug changes
insert update delete done
restore
doctor can search patient and look at their records
update