changed employee lists
merge conflict
fixed dump
appointmentID now called 'appointmentID' lol
added auto_increment to appointmendID in appoint and roomID is now default null
added doctorID to patient table
Code Merged with Seb's
	modified:   starline/doctor.php
	modified:   starline/inc/inc_interns.php
	modified:   starline/inc/inc_patients.php
Merge branch 'master' of ssh://github.com/ma3lstrom/comp353-project

Conflicts:
	starline.sql

	modified:   starline.sql