Merge branch 'branch-update-UG' of https://github.com/gremmyz/tp into branch-update-UG

Author: gremmyz

docs/UserGuide.md

@@ -681,9 +681,10 @@ You'll need to download the desktop application for <a href="https://www.whatsap
 
 Format: `upcoming-b`
 
-> Lists all contacts who have upcoming birthdays within the next 60 days.
+> Shows all contacts who have upcoming birthdays within the next 60 days.
 
-Never forget a birthday again! With `upcoming-b`, you can check which of your friends has birthdays in the next 60 days (approx. 2 months).
+Never forget a birthday again! With `upcoming-b`, you can check which of your friends have their 
+birthdays in the next 60 days (approx. 2 months).
 
 **Upcoming Birthday Example:**
 

src/main/java/seedu/connectus/model/util/SampleDataUtil.java

@@ -83,7 +83,7 @@ public static Person[] getSamplePersons() {
         p5.setEmail(new Email("[email protected]"));
         p5.setSocialMedia(new SocialMedia(null,
                 Telegram.of("irfanibrahim"), null));
-        p5.setBirthday(new Birthday("29/02/2004"));
+        p5.setBirthday(new Birthday("29/04/2004"));
         p5.setRemarks(getRemarkSet("classmates"));
         p5.setModules(getModuleSet("CS1101S"));
         p5.setCcas(getCcaSet("Art Club"));
@@ -93,7 +93,7 @@ public static Person[] getSamplePersons() {
         p6.setEmail(new Email("[email protected]"));
         p6.setSocialMedia(new SocialMedia(Instagram.of("roy.balakrishnan"),
                 Telegram.of("roybalakrishnan"), null));
-        p6.setBirthday(new Birthday("24/09/2004"));
+        p6.setBirthday(new Birthday("04/05/2004"));
         p6.setRemarks(getRemarkSet("classmates"));
         p6.setModules(getModuleSet("CS1101S"));
         p6.setCcas(getCcaSet("NUS Chess Club"));