Resolve merge conflicts

docs/AboutUs.md

@@ -31,6 +31,17 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`
 
 * Role: Java Expert
 * Responsibilities: Helps other team members with matters related to the Java programming language.
+=======
+
+### Yee Jun Hyeok Bryan
+
+<img src="images/bryanyee33.png" width="200px">
+
+[[github](http://github.com/bryanyee33)]
+[[portfolio](team/bryanyee33.md)]
+
+* Role: UI & UX expert
+* Responsibilities: Manages things related to the UI & UX such as JavaFX and design.
 
 ### Johnny Doe
 

docs/team/bryanyee33.md

@@ -0,0 +1,38 @@
+---
+  layout: default.md
+  title: "Bryan Yee's Project Portfolio Page"
+---
+
+### Project: AssetBook-3
+
+AssetBook-3 is a desktop application for logistics managers to keep track point-of-contacts' (POCs) contact information, along with their relevant assets. It is meant for those who have too many POCs and assets, and wish to easily retrieve contact details based on name, tag, or asset ID.
+
+The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
+
+Given below are my contributions to the project.
+
+* **New Feature**:
+  * What it does:
+  * Justification:
+  * Highlights:
+  * Credits:
+
+* **New Feature**:
+
+* **Code contributed**: [RepoSense link]()
+
+* **Project management**:
+
+* **Enhancements to existing features**:
+
+* **Documentation**:
+  * User Guide:
+  * Developer Guide:
+
+* **Community**:
+  * PRs reviewed (with non-trivial review comments):
+  * Contributed to forum discussions (examples: )
+  * Reported bugs and suggestions for other teams in the class (examples: )
+  * Some parts of the history feature I added was adopted by several other class mates ()
+
+* **Tools**: