Merge pull request #31 from dasha3412/branch-UpdateAboutMe

Update AboutUs (Dasha)

Resolve conflicts in About Us during merge.

docs/AboutUs.md

@@ -30,15 +30,15 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`
 * Role: Team Lead
 * Responsibilities: UI
 
-### Johnny Doe
+### Dasha Sychova
 
-<img src="images/johndoe.png" width="200px">
+<img src="images/dasha3412.png" width="200px">
 
-[[github](http://github.com/johndoe)] 
-[[portfolio](team/johndoe)]
+[[github](http://github.com/dasha3412)]
+[[portfolio](team/dasha3412.md)]
 
 * Role: Developer
-* Responsibilities: Data
+* Responsibilities: UI, Documentation, Scheduling and tracking
 
 ### Ricco Lim
 
@@ -58,4 +58,4 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`
 [[portfolio](team/tingxuanp.md)]
 
 * Role: Developer, Documentation, Deliverables and deadlines
-* Responsibilities: UI
+* Responsibilities: UI

docs/team/dasha3412.md

@@ -0,0 +1,13 @@
+---
+  layout: default.md
+  title: "Dasha's Project Portfolio Page"
+---
+
+### Project: WedLinker
+
+WedLinker is a desktop contact keeping application used for wedding planners to keep track of their contacts.
+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.
+
+**To be updated**