Fixed Appointment Conflict Test
Merge branch 'master' of https://github.com/wlindsay/ECE356-Project