From 63e6a3145c6fd789a4231a817ed9e914466a7287 Mon Sep 17 00:00:00 2001
From: varkon256 <kondavarsha@hotmail.com>
Date: Fri, 2 Apr 2021 15:40:50 -0700
Subject: [PATCH] Merge fix and office hours

---
 assignments/index.md | 3 ---
 index.md             | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/assignments/index.md b/assignments/index.md
index 1fd035e1..88b1765a 100644
--- a/assignments/index.md
+++ b/assignments/index.md
@@ -22,9 +22,6 @@ questions or run into issue, please contact the course staff.
 | [HW1: Improve a screen reader]({{site.baseurl}}/assignments/hw1-nvda.html)               |   |  | 
 | Activity2: Make a website usable with switch access -- spec coming soon.               |   |  |
 | [Activity3: Describe pictures and videos]({{site.baseurl}}/assignments/act3-describing-video-image.html)               |   |  |
-<<<<<<< HEAD
-| HW2: Teach machines to recognize sounds and visualize them -- spec coming soon.               |   |  |
-=======
 | [HW2: teach machines to recognize sounds and visualize them]({{site.baseurl}}/assignments/hw2-soundRecognition.html) -- spec coming soon, timeline updated.               |   |  |
 | [Final project: Make the World more accessible]({{site.baseurl}}/assignments/project.html)               |   |  |
 
diff --git a/index.md b/index.md
index 64a11332..438f7a33 100755
--- a/index.md
+++ b/index.md
@@ -28,7 +28,7 @@ See [Canvas]({{site.canvas}}) for all zoom meeting links
 
 ## Instructor
 
-![Jen Mankoff](assets/img/staff/mankoff.jpg){:width="80px"} | [Jennifer Mankoff]({{site.author.url}}) (she/her) <br>  Office Hours: TBD
+![Jen Mankoff](assets/img/staff/mankoff.jpg){:width="80px"} | [Jennifer Mankoff]({{site.author.url}}) (she/her) <br>  Office Hours: Thursdays, 12:30pm - 1:30pm
 
 ## TA
 
-- 
GitLab