here goes nothing
almost...
made class_schedule_calndar_page.html
committing
Merge remote-tracking branch 'charlie/master' into integration_2
Merge branch 'integration_3'