solved some conflicts between branches

src/main/java/models/PerformanceMetrics.java

@@ -9,7 +9,9 @@ public class PerformanceMetrics {
     private double W;
     private double Wq;
 
-    public PerformanceMetrics(){};
+    public PerformanceMetrics() {
+    }
+
     public PerformanceMetrics(double l, double lq, double w, double wq) {
         L = l;
         Lq = lq;

src/main/java/models/QueueModel.java

@@ -8,7 +8,7 @@
 public abstract class QueueModel {
 
     /**
-     * Calls {@link #calculatePerformanceMetrics(double, double)} asynchronously by returning an {@link Observable}
+     * Calls {@link #calculatePerformanceMetrics(QueueSystemInput)} asynchronously by returning an {@link Observable}
      * which can be observed on a background thread.
      *
      * @param input: the Queue System Input Variables

src/main/java/models/QueueType.java

@@ -5,5 +5,5 @@
  * Date: 17-Dec-17.
  */
 public enum QueueType {
-    DD1K, MM1, MMCK;
+    DD1K, MM1, MM1K, MMC, MMCK;
 }

src/main/java/ui/InputScreenController.java

@@ -54,7 +54,7 @@ public void initView(QueueType queueName) {
                 showSystemCapacity = false;
                 showNumberOfServers = true;
                 break;
-            case MMK:
+            case MM1K:
                 showSystemCapacity = true;
                 showNumberOfServers = false;
                 break;