Added office hours for Kai
Added office hours for Gianni
Merge remote-tracking branch 'origin/gianni-office-hours'
fixed first merge conflict