no message
Merge branch 'master' of https://github.com/JsFlo/ScheduleHelper

Conflicts:
	src/main/java/com/Team1/schedule/TimeSlotController.java