Merge branch 'integration'
final stretch...
Modified new_program.html and programs.html
Made teacher_income_page.html
Merge remote-tracking branch 'carlos/master' into integration_2
Merge branch 'integration_2'
made class_schedule_calndar_page.html
Merge remote-tracking branch 'charlie/master' into integration_2
Merge branch 'integration_3'