Updates to schedule

Merged Chad's pull with a merge conflict fix.
Updated Break to colspan.