Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp

# Conflicts: # docs/UserGuide.md # src/main/java/fittrack/parser/CommandParser.java
AY2324S1-CS2113-W12-4 · Nov 13, 2023 · 05463f7 · 05463f7
2 parents 5b4861a + 50dbef3
commit 05463f7
Show file tree

Hide file tree

Showing 89 changed files with 2,586 additions and 952 deletions.
diff --git a/docs/AboutUs.md b/docs/AboutUs.md
@@ -1,10 +1,10 @@
 # About us
 
-| Display                                                |      Name       |              Github Profile              |             Portfolio             |
-|--------------------------------------------------------|:---------------:|:----------------------------------------:|:---------------------------------:|
-| ![](https://via.placeholder.com/100.png?text=Photo)    |  Faris Sirraj   |      [Github](https://github.com/)       | [Portfolio](docs/team/johndoe.md) |
-| ![](https://via.placeholder.com/100.png?text=Photo)    |    Yeon Jeho    |      [Github](https://github.com/)       | [Portfolio](docs/team/johndoe.md) |
-| <img src="images/joshua.jpg" width = 25% height = 25%> |  Joshua Leong   | [Github](https://github.com/J0shuaLeong) | [Portfolio](docs/team/joshua.md)  |
-| ![](https://via.placeholder.com/100.png?text=Photo)    | Ng Lixuan Nixon |      [Github](https://github.com/)       | [Portfolio](docs/team/johndoe.md) |
-| ![](https://via.placeholder.com/100.png?text=Photo)    |    Mark Lin     |      [Github](https://github.com/)       | [Portfolio](docs/team/johndoe.md) |
+| Display                                             |      Name       |              Github Profile              |               Portfolio               |
+|-----------------------------------------------------|:---------------:|:----------------------------------------:|:-------------------------------------:|
+| ![](https://via.placeholder.com/100.png?text=Photo) |  Faris Sirraj   |      [Github](https://github.com/)       |   [Portfolio](docs/team/johndoe.md)   |
+| ![](https://via.placeholder.com/100.png?text=Photo) |    Yeon Jeho    |   [Github](https://github.com/ICubE-)    |    [Portfolio](docs/team/jeho.md)     |
+| <img src="images/joshua.jpg" width=100 height=100>  |  Joshua Leong   | [Github](https://github.com/J0shuaLeong) | [Portfolio](docs/team/j0shualeong.md) |
+| ![](https://via.placeholder.com/100.png?text=Photo) | Ng Lixuan Nixon |      [Github](https://github.com/)       |   [Portfolio](docs/team/johndoe.md)   |
+| ![](https://via.placeholder.com/100.png?text=Photo) |    Mark Lin     |      [Github](https://github.com/)       |   [Portfolio](docs/team/johndoe.md)   |