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 remote-tracking branch 'origin/gianni-office-hours'

Merging Gianni's office hours.
Merge remote-tracking branch 'origin/kai-office-hours'

Conflicts:
	index.html

Committing kai's office hours
Was too confident; noticed after committing merge that there was an error on the web page.
Added extra line break to office hours so that the page looks better.
Merge remote-tracking branch 'origin/edit-1'

Merging edit-1
Merge remote-tracking branch 'origin/edit-2'

Conflicts:
	index.html
Misinterpreted the edit branches. I thought that edit-2 was "newer" since it had a higher number and was thus preferred,
but actually it is possible to include both changes for edit-1 and edit-2 (I was supposed to look at the commit messages
written by the CIS191 staff). Fixed this problem and ready to commit.