Merge branch 'master' of https://github.com/PeterAaser/TDT4255_EX2

src/test/scala/Manifest.scala

@@ -31,7 +31,8 @@ object Manifest {
     printMergedTrace   = true,
     nopPadded          = nopPadded,
     breakPoints        = Nil, // not implemented
-    testName           = singleTest)
+    testName           = singleTest,
+    maxSteps           = 15000)
 
 
   val allTestOptions: String => TestOptions = name => TestOptions(