Merge pull request #84 from callysto/uofc-new

update content to new extension

docs/uofc-labyrinth/index.html

@@ -41,7 +41,7 @@
 
       <h1 id="werklund-school-of-education-2023-labyrinth">Werklund School of Education 2023 Labyrinth</h1>
 
-<h3 id="thursday-november-30th-to-sunday-december-10th-2023">Thursday, November 30th to Sunday, December 10th, 2023</h3>
+<h3>Thursday, November 30th to Sunday, December 18th, 2023</h3>
 
 <p>Callysto is a free, online learning tool that helps Grades 5-12 students and teachers learn and apply in-demand data science skills including data analysis and visualization, coding, and computational thinking. Our mission is to foster computational thinking and data literacy skills in Canadian schools.</p>
 
@@ -77,9 +77,11 @@ <h2 id="online-support">Online Support</h2>
 <p>Callysto team members are available to help you with your Labyrinth.</p>
 
 <ul>
-  <li>Tuesday, Dec 5th 6:00PM- 8:00PM MST</li>
-  <li>Thursday, Dec 7th 6:00PM- 8:00PM MST</li>
-  <li>Friday, Dec 8th 12:00PM- 2:00PM MST</li>
+  <li>Tuesday, Dec 5th 6:00PM - 8:00PM MST</li>
+  <li>Thursday, Dec 7th 6:00PM - 8:00PM MST</li>
+  <li>Friday, Dec 8th 12:00PM - 2:00PM MST</li>
+  <li>Tuesday, Dec 11th 6:00PM - 8:00PM MST</li>
+  <li>Friday, Dec 14th 6:00PM - 8:00PM MST</li>
 </ul>
 
 <p>To join the video meeting, click <a href="https://meet.google.com/huh-uxim-vuv">here</a></p>

docs/uofc-labyrinth/old-README.md

@@ -1,6 +1,11 @@
+<<<<<<< HEAD:docs/uofc-labyrinth/README.md
+# Werklund School of Education 2023 Labyrinth 
+**Thursday, November 30th to Sunday, December 18th**
+=======
 # Werklund School of Education 2023 Labyrinth
 
 ### Thursday, November 30th to Sunday, December 10th, 2023
+>>>>>>> master:docs/uofc-labyrinth/old-README.md
 
 Callysto is a free, online learning tool that helps Grades 5-12 students and teachers learn and apply in-demand data science skills including data analysis and visualization, coding, and computational thinking. Our mission is to foster computational thinking and data literacy skills in Canadian schools.
 
@@ -21,8 +26,16 @@ Callysto team members are available to help you with your Labyrinth.
 * Tuesday, Dec 5th 6:00PM- 8:00PM MST
 * Thursday, Dec 7th 6:00PM- 8:00PM MST
 * Friday, Dec 8th 12:00PM- 2:00PM MST
+* Tuesday, Dec 11th 6:00PM- 8:00PM MST
+* Friday, Dec 14th 6:00PM- 8:00PM MST
 
+To join the video meeting, click this [link](https://meet.google.com/huh-uxim-vuv) 
+
+<<<<<<< HEAD:docs/uofc-labyrinth/README.md
+
+=======
 To join the video meeting, click [here](https://meet.google.com/huh-uxim-vuv)
+>>>>>>> master:docs/uofc-labyrinth/old-README.md
 
 ## Survey