finished schedule html stuff
hi
hi again
Merge branch 'master' into cynthia