Merge branch 'master' into branch-documentation

Darren159 · Oct 4, 2023 · 7b35027 · 7b35027
2 parents fcfb4ed + 8afd259
commit 7b35027
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 22 deletions.
diff --git a/docs/AboutUs.md b/docs/AboutUs.md
@@ -7,6 +7,7 @@
 
 We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).
 
+<<<<<<< HEAD
 You can reach us at the email `low.darren[at]u.nus.edu`
 
 ## Project team
@@ -20,6 +21,14 @@ You can reach us at the email `low.darren[at]u.nus.edu`
 
 * Role: Developer
 
+### Kim Hanjoo
+
+<img src="images/hjoneweek.png" width = "200px">
+
+[[github](https://github.com/hjoneweek)]
+[[portfolio](team/hjoneweek.md)]
+* Role: Developer
+
 ### Jane Doe
 
 <img src="images/johndoe.png" width="200px">
@@ -36,25 +45,3 @@ You can reach us at the email `low.darren[at]u.nus.edu`
 
 [[github](http://github.com/johndoe)] [[portfolio](team/johndoe.md)]
 
-* Role: Developer
-* Responsibilities: Data
-
-### Jean Doe
-
-<img src="images/johndoe.png" width="200px">
-
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
-
-* Role: Developer
-* Responsibilities: Dev Ops + Threading
-
-### James Doe
-
-<img src="images/johndoe.png" width="200px">
-
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
-
-* Role: Developer
-* Responsibilities: UI
diff --git a/docs/images/hjoneweek.png b/docs/images/hjoneweek.png
diff --git a/docs/team/hjoneweek.md b/docs/team/hjoneweek.md
@@ -0,0 +1,22 @@
+---
+layout: default.md
+title: "Hanjoo's Project Portfolio Page"
+---
+
+### Project: MedBook
+
+Overview: To be added soon
+
+Contributions: To be added soon
+
+* **New Feature 1**
+
+* **New Feature 2**
+
+* **Project management**
+
+* **Documentation**
+
+* **Community**
+
+