fix conflict
editing??
done with userID and patientID
Merge pull request #41 from menghong777/master

Removed unused form fields.
progress: 80%, can add patient already with error message. working on sticky now
Merge branch 'master' of https://github.com/joevo2/Clinic-Receptionist-System

Conflicts:
	nbproject/project.properties
Merge pull request #42 from ayako02/master

add patient 80% done, left sticky, can add patient with error messages
working on prescription
Add those to table ..the appointment table is been changed
Merge pull request #43 from burhan3759/master

Add those to table ..the appointment table is been changed
fix primary key bug
Merge branch 'master' of https://github.com/joevo2/Clinic-Receptionist-System
Merge pull request #44 from ayako02/master

fixed add patient bug
patient prescription done
Schedule minor code edit.