Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/seng202/group9/GUI/MenuController.java
2016-09-13 16:42:33 +12:00
parent 3e5b793cb2 6f14fc48f0
commit 9c594fd474
4 changed files with 48 additions and 35 deletions
@@ -1,25 +0,0 @@
-package seng202.group9.GUI;
-
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-
-/**
- * Main Menu Bar for the program
- * @author YaFedImYaEatIm
- *
- */
-public class MainMenuBar{
-	
-	final private String menuFXML = "menu.fxml";
-		
-	public Parent getmenuBar(){
-		try{
-			Parent menuPane = FXMLLoader.load(getClass().getClassLoader().getResource(menuFXML));
-			return menuPane;
-		}catch (Exception e){
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-}