Added "and" between adjectives to emphasize both words
Added office hours for Gianni
Merge branch 'master' into gianni-office-hours
merged kai
Merge branch 'edit-1'