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
Auto-restarting server, .gitignore, old system compatibility.
Merge branch 'gianni-office-hours'
merged gianni's office hours
Merge branch 'kai-office-hours'

Conflicts:
	index.html
Merge branch 'edit-1'
merge edit 1
merged