Merge branch 'master' of https://github.com/AY1920S1-CS2113T-W13-3/main

nusCS2113-AY1920S1 · Nov 10, 2019 · 6f7e2b0 · 6f7e2b0
2 parents 9d9e022 + d08cbb1
commit 6f7e2b0
Show file tree

Hide file tree

Showing 12 changed files with 116 additions and 39 deletions.
diff --git a/README.adoc b/README.adoc
@@ -15,9 +15,13 @@ ifndef::env-github[]
 image::images/Ui.PNG[width="600" height="400"]
 endif::[]
 
-* The project aims to build a product named Duke, a Personal Assistant Chatbot that helps a person to keep track of various things.
-* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
-* Project Duke is a **__?small?__** software project designed to take you through the steps of building a small software incrementally, while applying many Java and SE techniques along the way.
+* The project aims to build a product named `SGTravel`, a Personal Assistant Travel Planning application for Singapore Tourists!
+* This app has route planning, profile page, edit location and recommended itineraries feature up and running.
+* The latest release, version 1.4 was completed on 11/11/2019
+* The project showcases what we have learnt from our OOP and Software Engineering module and was made in the AY19/20 Semester 1 iteration of CS2113/T
+* This project was originally expanded on the Duke Chatbot project. 
+* Project by - Daniel, Hong Chuan, Sukrut and Jefferson!
+
 
 == Site Map
 

diff --git a/docs/DeveloperGuide.adoc b/docs/DeveloperGuide.adoc
diff --git a/docs/UserGuide.adoc b/docs/UserGuide.adoc
@@ -598,14 +598,12 @@ Format: `routeGenerate STARTLOCATION to ENDLOCATION by CONSTRAINT`
 Valid CONSTRAINT:
 
 * `bus`
-* `mrt`
 
 image::routeGenerate1.PNG[width="400" height="200"]
 
 Examples:
 
 * `routeGenerate amk hub to clementi by bus`
-* `routeGenerate amk hub to sungei gedong by mrt`
 
 [TIP]
 ====

diff --git a/docs/images/SGTravel_Itinerary_class_diagram.png b/docs/images/SGTravel_Itinerary_class_diagram.png
diff --git a/docs/images/SGTravel_addList_command_diagram.png b/docs/images/SGTravel_addList_command_diagram.png
diff --git a/docs/images/SGTravel_newItinerary_Command_diagram.png b/docs/images/SGTravel_newItinerary_Command_diagram.png
diff --git a/docs/images/SGTravel_routeAdd_diagram.png b/docs/images/SGTravel_routeAdd_diagram.png
diff --git a/docs/images/SGTravel_routeEdit_diagram.png b/docs/images/SGTravel_routeEdit_diagram.png
diff --git a/docs/images/SGTravel_routeGenerate_diagram.png b/docs/images/SGTravel_routeGenerate_diagram.png
diff --git a/docs/images/SGTravel_routeNodeNearby_diagram.png b/docs/images/SGTravel_routeNodeNearby_diagram.png
diff --git a/docs/images/Ui.png b/docs/images/Ui.png
diff --git a/docs/images/routeGenerate1.PNG b/docs/images/routeGenerate1.PNG