schedule desciption
Merge remote-tracking branch 'origin/master'

Conflicts:
	scheduleAssignment/src/scheduleAssignment/CSchedule.java