testing pull request
fixed merge conflict
Merge branch 'ayako02-master'
updated readme
Merge pull request #7 from menghong777/master

Added NavBar.jsp and fixed conflicts files
Merge pull request #8 from menghong777/master

Fixed unable connect to database driver problem.
just enable the original error generated by netbean
start working on add patient
Merge pull request #9 from ayako02/master

start working on add patient
Merge pull request #10 from burhan3759/master

just enable the original error generated by netbean
new dummy database with user: admin pass:123456 and pass:admin for easier debug
Merge branch 'master' of https://github.com/joevo2/Clinic-Receptionist-System

Conflicts:
	web/patient_add.jsp