Resolved conflicts

docs/UserGuide.adoc

@@ -249,7 +249,7 @@ Here are some examples to guide you with editing contacts in Augustine:
 . [red]*Adding and removing tags*
 +
 --
-You can add or remove the tags to/from a particular contact using the [fuchsia]`edit` command below (See Figures 6 and 7).
+You can add or remove the tags to/from a particular contact using the [fuchsia]`edit` command below (see Figure 6).
 
 [horizontal]
 *Command:* :: [fuchsia]`edit 2 t/colleagues t/friends`
@@ -720,15 +720,15 @@ The Birthdays tab lists all your existing contacts starting from the contact wit
 ****
 *Things to take note:* +
 
-* You cannot edit Augustine data using with reference to the contacts' ordering in the Birthdays tab. You should be referring to the main Contact List tab
+* You cannot edit Augustine data using the contacts' ordering in the Birthdays tab. You should be referring to the main Contact List tab
 to make changes to the data.
 * You do not need to manually update the Birthdays tab, any changes made to the data will be reflected in both the Contact List
 and Birthdays tab automatically.
 ****
 
 [TIP]
 The contact whose birthday is today (according to system time) will be highlighted in blue. Send him your well wishes!
-(See Figure 20)
+(see Figure 20)
 
 [caption="Figure 20. "]
 .Birthdays tab with highlighted contact

docs/team/hengyu.adoc

@@ -3,10 +3,9 @@ ifdef::env-github,env-browser[:outfilesuffix: .adoc]
 :imagesDir: ../images
 :stylesDir: ../stylesheets
 
-== Project: AddressBook - Level 4
-AddressBook - Level 4 is a desktop address book application used for teaching Software Engineering principles. The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 6 kLoC.
+== Project: Augustine
 
-*Code contributed*: [https://github.com/CS2103AUG2017-W14-B2/main/blob/master/collated/main/hengyu95.md[Functional code]] [https://github.com/CS2103AUG2017-W14-B2/main/blob/master/collated/test/hengyu95.md[Test code]] {give links to collated code files}
+*Code contributed*: [https://github.com/CS2103AUG2017-W14-B2/main/blob/master/collated/main/hengyu95.md[Functional code]] [https://github.com/CS2103AUG2017-W14-B2/main/blob/master/collated/test/hengyu95.md[Test code]]
 
 === Enhancement Added: Birthdate Field/Tab
 
@@ -95,3 +94,7 @@ include::../DeveloperGuide.adoc[tag=backup]
 #End of Extract#
 
 ---
+
+==== Other contributions
+
+* Proofreader of the user and developer guides.