Merge remote-tracking branch 'remotes/upstream/master' into add_map_sets_koans

Conflicts:
	lib/runner.ex

test/koans/protocols_koans_test.exs

@@ -0,0 +1,14 @@
+defmodule ProtocolsTests do
+  use ExUnit.Case
+  import TestHarness
+
+  test "Protocols" do
+    answers = [
+      {:multiple, ["Andre signed up for violin", "Darcy enrolled for ballet"]},
+      "Pupil enrolled at school",
+      Protocol.UndefinedError
+    ]
+
+    test_all(Protocols, answers)
+  end
+end