From 5e727a5054eda1dfc4206f7e9a4178daa284b492 Mon Sep 17 00:00:00 2001
From: flysaiah <mayeis01@yahoo.com>
Date: Sat, 18 Jun 2016 23:07:21 -0500
Subject: [PATCH 1/3] Skipped MCMA questions are now counted correctly

---
 runestone/assess/js/timedmc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runestone/assess/js/timedmc.js b/runestone/assess/js/timedmc.js
index 43b406d38..e85874f2e 100644
--- a/runestone/assess/js/timedmc.js
+++ b/runestone/assess/js/timedmc.js
@@ -111,6 +111,8 @@ TimedMC.prototype.checkCorrectTimedMCMA = function () {
         this.correct = true;
     } else if (this.givenArray.length !== 0) {
         this.correct = false;
+    } else {   // question was skipped
+        this.correct = null;
     }
     switch (this.correct) {
         case (true):

From 80fbb6086b2b42a3ab4bb7afbb3721fbfab16e69 Mon Sep 17 00:00:00 2001
From: flysaiah <mayeis01@yahoo.com>
Date: Sat, 18 Jun 2016 23:15:45 -0500
Subject: [PATCH 2/3] Timed DND answers don't bleed into feedback anymore

---
 runestone/dragndrop/css/dragndrop.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runestone/dragndrop/css/dragndrop.css b/runestone/dragndrop/css/dragndrop.css
index 1afa87813..55621a417 100644
--- a/runestone/dragndrop/css/dragndrop.css
+++ b/runestone/dragndrop/css/dragndrop.css
@@ -47,6 +47,7 @@
 
 .draggable-feedback {
     text-align: left !important;
+    clear: both;
 }
 
 .draggable-drop {

From a061d3e6c98709f6eed0d50cc9f9c1945e1c1d25 Mon Sep 17 00:00:00 2001
From: Isaiah Mayerchak <immayerc@us.ibm.com>
Date: Wed, 29 Jun 2016 22:04:32 -0500
Subject: [PATCH 3/3] Allow more than one timed per page

---
 runestone/assess/js/timed.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/runestone/assess/js/timed.js b/runestone/assess/js/timed.js
index d82360933..d9b232029 100644
--- a/runestone/assess/js/timed.js
+++ b/runestone/assess/js/timed.js
@@ -121,8 +121,8 @@ Timed.prototype.renderContainer = function () {
 Timed.prototype.renderTimer = function () {
     this.wrapperDiv = document.createElement("div");
     this.timerContainer = document.createElement("P");
-    this.wrapperDiv.id = "startWrapper";
-    this.timerContainer.id = "output";
+    this.wrapperDiv.id = this.divid + "-startWrapper";
+    this.timerContainer.id = this.divid + "-output";
     this.wrapperDiv.appendChild(this.timerContainer);
     this.showTime();
 };
@@ -490,8 +490,7 @@ Timed.prototype.checkIfFinished = function () {
 
 Timed.prototype.tookTimedExam = function () {
     // Checks if this exam has been taken before
-
-    $("#output").css({
+    $(this.timerContainer).css({
         "width": "50%",
         "margin": "0 auto",
         "background-color": "#DFF0D8",