Added office hours for Kai
Added "and" between adjectives to emphasize both words
Added office hours for Gianni
Use fancier words to make the point more clearly
Merge branch 'gianni-office-hours'

gianni first merge
merge with kai, after fixing conflicts
Merge branch 'edit-1'

first merge with edit-1
merge with edit-2, after fixing conflicts