From 148dc2c847a9ee8e0f83c90334a65f7b7972777e Mon Sep 17 00:00:00 2001
From: Aniruddh Agarwal <aaniruddh99@gmail.com>
Date: Tue, 1 Sep 2015 23:07:32 +0800
Subject: [PATCH 1/4] updated description of waypoint to make it more specific

---
 seed/challenges/html5-and-css.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 8d72837af3..78ee8ae7f2 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -3053,7 +3053,7 @@
         "Let's try this again, but with <code>margin</code> this time.",
         "Instead of specifying an element's <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code>, and <code>margin-left</code> properties, you can specify them all in one line, like this: <code>margin: 10px 20px 10px 20px;</code>.",
         "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific margin instructions.",
-        "Use <code>Clockwise Notation</code> to give an element a margin of <code>40px</code> on its top and left side, but only <code>20px</code> on its bottom and right side."
+        "Use <code>Clockwise Notation</code> to give the <code>green-box</code> class a margin of <code>40px</code> on its top and left side, but only <code>20px</code> on its bottom and right side."
       ],
       "tests": [
         "assert($(\".green-box\").css(\"margin-top\") === \"40px\", 'Your <code>green-box</code> class should give the top of elements <code>40px</code> of <code>margin</code>.')",

From f3792ca2db5c7313ff202b5043688a0bb2b91cec Mon Sep 17 00:00:00 2001
From: Ammar Dodin <ammardodin@gmail.com>
Date: Wed, 2 Sep 2015 00:52:06 -0700
Subject: [PATCH 2/4] Updated README.md

There should be an apostrophe after the s on bonfires to indicate possession.
---
 common/app/routes/Bonfires/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/app/routes/Bonfires/README.md b/common/app/routes/Bonfires/README.md
index d28c45c44e..047bc43183 100644
--- a/common/app/routes/Bonfires/README.md
+++ b/common/app/routes/Bonfires/README.md
@@ -1 +1 @@
-This folder contains things relative to the bonfires screens
+This folder contains things relative to the bonfires' screens

From 357f378c21807249e839c9ef4f38138f4d38d8ed Mon Sep 17 00:00:00 2001
From: Aniruddh Agarwal <awesomeaniruddh@users.noreply.github.com>
Date: Fri, 4 Sep 2015 17:44:27 +0800
Subject: [PATCH 3/4] Update html5-and-css.json

---
 seed/challenges/html5-and-css.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 78ee8ae7f2..db444d8476 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -3053,7 +3053,7 @@
         "Let's try this again, but with <code>margin</code> this time.",
         "Instead of specifying an element's <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code>, and <code>margin-left</code> properties, you can specify them all in one line, like this: <code>margin: 10px 20px 10px 20px;</code>.",
         "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific margin instructions.",
-        "Use <code>Clockwise Notation</code> to give the <code>green-box</code> class a margin of <code>40px</code> on its top and left side, but only <code>20px</code> on its bottom and right side."
+        "Use <code>Clockwise Notation</code> to give the element with the <code>green-box</code> class a margin of <code>40px</code> on its top and left side, but only <code>20px</code> on its bottom and right side."
       ],
       "tests": [
         "assert($(\".green-box\").css(\"margin-top\") === \"40px\", 'Your <code>green-box</code> class should give the top of elements <code>40px</code> of <code>margin</code>.')",

From f7d7990c4fc178d3239a9ae92b8692d2d5294e71 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Fri, 4 Sep 2015 21:34:07 +0100
Subject: [PATCH 4/4] Fixed double click issue

---
 client/commonFramework.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index dd91756e06..45589df873 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -421,7 +421,7 @@ function showCompletion() {
   );
   var bonfireSolution = myCodeMirror.getValue();
   var didCompleteWith = $('#completed-with').val() || null;
-  $('#complete-courseware-dialog').modal('show');
+  $('#complete-courseware-dialog').modal('show').focus();
   $('#submit-challenge').click(function(e) {
     e.preventDefault();
 
@@ -639,6 +639,9 @@ var runTests = function(err, data) {
       allTestsPassed = false;
       showCompletion();
     }
+    else{
+      isInitRun = false;
+    }
   }
 };
 
@@ -755,7 +758,6 @@ $(document).ready(function() {
     allSeeds;
 
   myCodeMirror.setValue(replaceSafeTags(editorValue));
-
   if (typeof $preview.html() !== 'undefined') {
     $preview.load(function() {
       if (initPreview) {