calendar update

calendar.md

@@ -15,13 +15,19 @@ description: Calendars with times for all course events.
 
 ## Office Hours Calendar
 
-In-person office hours are in <span style="color:blue">**blue**</span>, click on each event to see which GSI and/or reader is running each office hour time. You should come to these with questions about anything – labs, homeworks, discussions, concepts, etc. 
+In-person office hours are in <span style="color:blue">**blue**</span>, while virtual office hours are in <span style="color:brown">**brown**</span>. You should come to these with questions about anything – labs, homeworks, discussions, concepts, etc.
 
-**Note: All office hours will be held in-person in Warren Hall 101B.**
+<!-- Click on each event to see which GSI and/or reader is running each office hour time.   -->
 
-Instructor office hours with Bella and Dominic appear in <span style="color:red">**red**</span>. You should come to these with questions about concepts.
+**Note: Almost all office hours will be held in-person in Warren Hall 101B. A small, limited portion of office hours are listed as online, primarily to accommodate online/remote students. From our experience in previous semesters, the office hour experience in-person is much better (and much, much faster) than online.**
 
-<iframe src="https://calendar.google.com/calendar/embed?height=600&wkst=1&bgcolor=%23ffffff&ctz=America%2FLos_Angeles&showTitle=0&mode=WEEK&src=Y19hZWNnMGE0djVlYmdjbDh0amo3cTcyNm9wNEBncm91cC5jYWxlbmRhci5nb29nbGUuY29t&src=Y19pZmlxOTA3MGI5OGprMDJoYnI4cDM3djNlc0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t&color=%233F51B5&color=%23D50000" style="border:solid 1px #777" width="800" height="600" frameborder="0" scrolling="no"></iframe>
+To access in-person office hours, go to the room in the location of the office hour slot you're planning on attending.
+
+To access virtual office hours, place your ticket on the [queue](http://oh.ds100.org/) and then join the call with the "Join Call" button when your name is pulled.
+
+Instructor office hours with Prof. Norouzi and Prof. Pérez appear in <span style="color:red">**red**</span>. You should come to these with questions about concepts.
+
+<iframe src="https://calendar.google.com/calendar/embed?height=600&wkst=1&bgcolor=%23ffffff&ctz=America%2FLos_Angeles&showTitle=0&mode=WEEK&src=Y190OGE0MzY1cGhmY20wMGUyOW1oMXVha3Fuc0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t&src=Y19wZjBhcmZlYnBndGtiNTJlb25jbzNxMmVwMEBncm91cC5jYWxlbmRhci5nb29nbGUuY29t&src=Y19hZWNnMGE0djVlYmdjbDh0amo3cTcyNm9wNEBncm91cC5jYWxlbmRhci5nb29nbGUuY29t&src=Y19pZmlxOTA3MGI5OGprMDJoYnI4cDM3djNlc0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t&color=%237CB342&color=%23795548&color=%233F51B5&color=%23D50000" style="border:solid 1px #777" width="800" height="600" frameborder="0" scrolling="no"></iframe>
 
 <br>