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' of github.com:saveprobe/CIS191-demo-site

Merging to add information regarding Gianni's office hours
Merge branch 'kai-office-hours' of github.com:saveprobe/CIS191-demo-site

Conflicts:
	index.html

Resolved merge error by including both office hours.
Fixed paragraph html elements
Merge branch 'edit-1' of github.com:saveprobe/CIS191-demo-site

Merging in edit-1
Merge branch 'edit-2' of github.com:saveprobe/CIS191-demo-site

Conflicts:
	index.html

Kept fancy word from edit-2 and the "and" from edit-1.