Fixing merge errors

cstschedule.html
functions.js