Fixed test for instructor conflict
Merge branch 'develop' of https://github.com/donnell74/CSC-450-Scheduler into develop