unfinished calendar work
fixed tab/space mixing in main.js, fixed button-bad-linkage on homepage.ejs, removed unused span from picking_times.ejs
fixed merge conflict
fixed other merge conflict
fixed other merge conflict