fix conflict
editing??
done with userID and patientID
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