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

Conflicts:
	index.html
Merge remote-tracking branch 'origin/edit-1'
Merge remote-tracking branch 'origin/edit-2'

Conflicts:
	index.html
changed the port number to 9001 in server.py
hi
hi
hi
edited README.md
empty
Merge branch 'deploy' of ec2-54-201-44-236.us-west-2.compute.amazonaws.com:~/deploy into deploy
markdown style