done edit page
prepping for merge
Merge branch 'ilia' of https://github.com/ilrein/Scheduler into show_schedule