Fixed merge conflict

SciCalc.java

@@ -1,15 +1,13 @@
-    
+
 /**
 * 4.2 Scientific Calculator Group Project
 * Trinh Tong, Lauren Green, Michelle Dimarino
 * Advanced Calculator Menu
-* 
-* TO DO
-* 
-* Add MainMenu class - displays mainmenu / calls back to main menu
 */
 public class SciCalc 
 {
+
+
     public void toSciMenu() {
         Console.println("Scientific Calculator Functions:"
                          + "\n1: Base Conversion - Converts input to selected base"

package.bluej

@@ -26,10 +26,17 @@ dependency8.type=UsesDependency
 dependency9.from=MemoryFunc
 dependency9.to=Console
 dependency9.type=UsesDependency
+<<<<<<< HEAD
 editor.fx.0.height=0
 editor.fx.0.width=0
 editor.fx.0.x=0
 editor.fx.0.y=0
+=======
+editor.fx.0.height=722
+editor.fx.0.width=1120
+editor.fx.0.x=320
+editor.fx.0.y=119
+>>>>>>> master
 objectbench.height=214
 objectbench.width=595
 package.divider.horizontal=0.6