Merge branch 'fasit'

Conflicts:
	oo-traits/src/test/scala/scalaexamples/companionobject/CompanionObjectTest.scala

Author: stoyle

oo-traits/src/test/scala/scalaexamples/companionobject/CompanionObjectTest.scala

@@ -22,12 +22,13 @@ class CompanionObjectTest {
 
     // val trainObject = Train
     // val trainThree = trainObject(Array("Espen"))
-    // assertEquals(List("Espen"), trainOne.passengers)
+    // assertEquals(List("Espen"), trainThree.passengers)
     // assertTrue(trainThree.conductor.isEmpty)
 
     // val trainFour = trainObject.apply(Some("conductor"), "Espen")
-    // assertEquals(List("Espen"), trainOne.passengers)
+    // assertEquals(List("Espen"), trainFour.passengers)
     // assertTrue(trainFour.conductor.isDefined)
+
   }
 
 }