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:huacchen/CIS191-demo-site into gianni-office-hours
Merge branch 'kai-office-hours' of github.com:huacchen/CIS191-demo-site into kai-office-hours

Conflicts:
	index.html
Merge branch 'edit-1' of github.com:huacchen/CIS191-demo-site into edit-1

git pull origin edit-1
deleted a typo