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

# By Daniel Hebrink
# Via Daniel Hebrink
* 'develop' of https://github.com/donnell74/CSC-450-Scheduler:
  Fixed test for instructor conflict
Add period to test xml to pass tests