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 OH first merge
Merge branch 'kai-office-hours'

Conflicts:
	index.html

Second merge, fixed conflict kai vs. gianni
Merge branch 'edit-1'

merge with edit-1, third merge overall
Last commit after second merge conflict