updates

Seeed-Studio · Feb 19, 2024 · a6a1aa2 · a6a1aa2
2 parents 7867a27 + bf58dc5
commit a6a1aa2
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/2024-01-MIT/Ganit/README.md b/2024-01-MIT/Ganit/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## ‘Research at Scale’ Journey - Shenzhen 2024
 
 <img src="pictures/G_1.jpeg" width="1000">
@@ -34,3 +35,18 @@ My group uses wearable devices to detect color change through glove interaction.
 “HandSight” developed to present an interactive digital Gloves that Capture and Augment Colors through Touch.
 Group memebers: Derrek Chow, Ganit Goldstein, Hila Mor & Yue Yang.
 
+=======
+## ‘Research at scale’ Journey - Shenzhen 2024
+
+<img src="pictures/G_1.jpeg" width="1000">
+
+
+The Journey in Shenzhen for me revealed an intersection between design and  technology by being introduced to large scale manufacturing, fabrication techniques, art museums, technology developments, and unique cultural exchange. As a Fashion designer and Textile Researcher specializing in e-textile and smart textile systems for wearables, witnessing insights from both the electronics and textile industries was a meaningful and eye-opening experience. 
+In this documentation I will introduce my own insights in participation in the HCI Symposium and Seeed Hackathon, along with interesting visits to various manufacturing sites such as electronic and fabric markets, PCB and textile factories and additionally, I will highlight the art and cultural experiences that enriched our stay.
+
+
+## HCI Symposium and SUSTech visit 
+
+<img src="pictures/G_2.jpeg" width="1000">
+
+>>>>>>> bf58dc5a522163658ffe1d01580157f11b669e0e