Added office hours for Kai
Added office hours for Gianni
Merge branch 'gianni-office-hours'
Merge branch 'kai-office-hours'

Conflicts:
	index.html