Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202

README.txt

@@ -3,4 +3,15 @@ If you are using Eclipse as an IDE please follow the instructions on http://www.
 
 To Import this project:
 git clone https://eng-git.canterbury.ac.nz/fwy13/SENG202.git
-Open your preferred IDE and then Import Maven Project.
+Open your preferred IDE and then Import Maven Project.
+
+Getting started:
+If there is no data in the database, you can select a file to import using File -> Import <data> for which type of data you are choosing to import.
+This will automatically take you to the summary page for the type of data imported.
+Also, all buttons will work without any data loaded except the tables will be empty.
+
+Each page will also have buttons leading to other summary pages of different data types.
+The raw data can add data by filling in the fields and pressing Add.
+The raw data can also filter/search through the data by typing in the fields needed and pressing Go.
+The Analyse button in the raw data will take you to a graph if it has been implemented.
+There is only one option currently in the Analysis tab, which calculates the distance between two airports in the database.

src/main/resources/menu.fxml

@@ -49,11 +49,6 @@
                <items>
                   <MenuItem mnemonicParsing="false" onAction="#veiwDistCalc" text="Calculate distance between Airports" />
                </items></Menu>
-          <Menu mnemonicParsing="false" text="Help">
-            <items>
-              <MenuItem mnemonicParsing="false" text="Getting Started" />
-            </items>
-          </Menu>
         </menus>
       </MenuBar>
    </children>