From 4dcaac8bc58bab9057f6e08ab28c2a39b8086655 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 06:51:17 -0400
Subject: [PATCH 01/17] Specifies to add a solid border, closes #694

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

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index e1e4a582dc..bb8c5bd7aa 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -734,7 +734,7 @@
       "name": "Waypoint: Add Borders Around your Elements",
       "difficulty": 0.028,
       "description": [
-        "Create a class called \"thick-green-border\" that puts a 10-pixel-wide green border around an HTML element, and apply it to your cat photo.",
+        "Create a class called \"thick-green-border\" that puts a 10-pixel-wide green border with a style of \"solid\" around an HTML element, and apply it to your cat photo.",
         "CSS borders have attributes like style, color and width.",
         "For example, if we wanted to create a red, 5 pixel border around an HTML element, we could use this class: <code>&#60;style&#62; .thin-red-border { border-color: red; border-width: 5px; border-style: solid; } &#60;/style&#62;</code>."
       ],

From e3fff3808e2cbcfe59345a9c78579f6b92cf9227 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 06:55:03 -0400
Subject: [PATCH 02/17] Linkifies image in custom heading challenge, closes
 #693

---
 seed_data/challenges/bootstrap.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed_data/challenges/bootstrap.json b/seed_data/challenges/bootstrap.json
index a0f662ffb2..67076c6aa8 100644
--- a/seed_data/challenges/bootstrap.json
+++ b/seed_data/challenges/bootstrap.json
@@ -792,7 +792,7 @@
         "We will make a simple heading for our Cat Photo App by putting them in the same row.",
         "Remember, Bootstrap uses a responsive grid system, which makes it easy to put elements into rows and specify each element's relative width. Most of Bootstrap's classes can be applied to a <code>div</code> element.",
         "Here's a diagram of how Bootstrap's 12-column grid layout works:",
-        "<img class='img-responsive' src='https://www.evernote.com/l/AHTwlE2XCLhGFYJzoye_QfsF3ho6y87via4B/image.png'>",
+        "<a href='http://getbootstrap.com/css/#grid' target='_blank'><img class='img-responsive' src='https://www.evernote.com/l/AHTwlE2XCLhGFYJzoye_QfsF3ho6y87via4B/image.png'></a>",
         "Note that in this illustration, we use the <code>col-md-*</code> class. Here, \"md\" means \"medium\", and \"*\" is a number specifying how many columns wide the element should be. In this case, we're specifying how many columns wide an element should be on a medium-sized screen, such as a laptop.",
         "In the Cat Photo App that we're building, we'll use <code>col-xs-*</code>, where \"*\" is the number of columns wide the element should be, and \"xs\" means \"extra small\", like an extra-small mobile phone screen.",
         "Notice how the image is now just the right size to fit along the text?"

From 268f58505075225d4d2953ccd1ebaf132ddd99c8 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 06:59:11 -0400
Subject: [PATCH 03/17] References correct expressworks challenges, closes #692

---
 seed_data/challenges/full-stack-javascript.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/seed_data/challenges/full-stack-javascript.json b/seed_data/challenges/full-stack-javascript.json
index fb9c17ec68..c0c564827e 100644
--- a/seed_data/challenges/full-stack-javascript.json
+++ b/seed_data/challenges/full-stack-javascript.json
@@ -285,11 +285,11 @@
         "Note that you can resize the c9.io's windows by dragging their borders.",
         "Make sure that you are always in your project's \"workspace\" directory. You can always navigate back to this directory by running this command: <code>cd ~/workspace</code>.",
         "Complete \"Hello World\"",
-        "Complete \"Juggling Async\"",
-        "Complete \"Time Server\"",
-        "Complete \"HTTP Collect\"",
-        "Complete \"Juggling Async\"",
-        "Complete \"Time Server\"",
+        "Complete \"Jade\"",
+        "Complete \"Good Old Form\"",
+        "Complete \"Stylish CSS\"",
+        "Complete \"Session and Cookie\"",
+        "Complete \"JSON Me\"",
         "Once you've completed these challenges, move on to our next waypoint."
       ],
       "challengeType": 2,

From 119060dc3f8df694bd2ee5214a3fb590fc6210d6 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 07:07:18 -0400
Subject: [PATCH 04/17] Reorder tests to display in clockwise notation, fixes
 typos in tests to match condition, closes #665

---
 seed_data/challenges/basic-html5-and-css.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index bb8c5bd7aa..dcdb7af127 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -2420,10 +2420,10 @@
         "You can also use this notation for margins!"
       ],
       "tests": [
-        "assert($('.green-box').css('margin-left') === '40px', 'Your <code>green-box</code> class should give the left of elements 40px of margin.')",
+        "assert($('.green-box').css('margin-top') === '40px', 'Your <code>green-box</code> class should give the top of elements 40px of margin.')",
+        "assert($('.green-box').css('margin-right') === '20px', 'Your <code>green-box</code> class should give the right of elements 20px of margin.')",
         "assert($('.green-box').css('margin-bottom') === '20px', 'Your <code>green-box</code> class should give the bottom of elements 20px of margin.')",
-        "assert($('.green-box').css('margin-top') === '40px', 'Your <code>green-box</code> class should give the top of elements 20px of margin.')",
-        "assert($('.green-box').css('margin-right') === '20px', 'Your <code>green-box</code> class should give the right of elements 20px of margin.')"
+        "assert($('.green-box').css('margin-left') === '40px', 'Your <code>green-box</code> class should give the left of elements 40px of margin.')"
 
       ],
       "challengeSeed": [

From f6cebdea2755768d20731f281517980c9fc08bae Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 07:20:50 -0400
Subject: [PATCH 05/17] Tests correct <a> tag for presence of href attribute
 set to '#', closes # 686

---
 seed_data/challenges/basic-html5-and-css.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index dcdb7af127..79d5d1e8ba 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -1099,7 +1099,8 @@
         "Once you've done this, hover over your image with your cursor. Your cursor's normal pointer should become the link clicking pointer. The photo is now a link."
       ],
       "tests": [
-        "expect($('a').children('img').length, 'Wrap your image element inside an anchor element that has its <code>href</code> attribute set to \"#\"').to.equal(1);"
+        "expect($('a').children('img').length, 'Wrap your image element inside an anchor element that has its <code>href</code> attribute set to \"#\"').to.equal(1);",
+        "expect(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Make sure to specify the \"src\" attritube as \"#\"').to.be.true;"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",

From 718ae04f2fe6865a1aa3d7ad7bd626f0f5663f95 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 08:26:25 -0400
Subject: [PATCH 06/17] Add ability to test editor contents. Ensures classes
 are implemented, closes # 684

---
 .../coursewaresHCJQFramework_0.1.5.js         | 13 ++++--------
 .../js/lib/coursewares/iFrameScripts_0.0.2.js | 19 ------------------
 .../js/lib/coursewares/iFrameScripts_0.0.3.js | 20 +++++++++++++++++++
 seed_data/challenges/basic-html5-and-css.json |  3 +++
 4 files changed, 27 insertions(+), 28 deletions(-)
 delete mode 100644 public/js/lib/coursewares/iFrameScripts_0.0.2.js
 create mode 100644 public/js/lib/coursewares/iFrameScripts_0.0.3.js

diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js
index f38739c15a..050a9fbc54 100644
--- a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js
+++ b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js
@@ -49,14 +49,9 @@ var libraryIncludes = "<script src='//ajax.googleapis.com/ajax/libs/jquery/2.1.3
   "<style>body { padding: 0px 3px 0px 3px; }</style>" +
   "<script>var expect = chai.expect; var should = chai.should(); var assert = chai.assert;</script>";
 
-var allTests = '';
-(function() {
-  tests.forEach(function(elem) {
-    allTests += elem + ' ';
-  });
-})();
 
-var otherTestsForNow = "<script src='/js/lib/coursewares/iFrameScripts_0.0.2.js'></script>";
+var editorValueForIFrame;
+var iFrameScript = "<script src='/js/lib/coursewares/iFrameScripts_0.0.3.js'></script>";
 
 var delay;
 // Initialize CodeMirror editor with a nice html5 canvas demo.
@@ -67,12 +62,13 @@ editor.on("keyup", function () {
 
 var nodeEnv = prodOrDev === 'production' ? 'http://www.freecodecamp.com' : 'http://localhost:3001';
 function updatePreview() {
+  editorValueForIFrame = editor.getValue();
   goodTests = 0;
   var previewFrame = document.getElementById('preview');
   var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
   preview.open();
   $('#testSuite').empty();
-  preview.write(libraryIncludes + editor.getValue() + otherTestsForNow);
+  preview.write(libraryIncludes + editor.getValue() + iFrameScript);
   preview.close();
 
 }
@@ -104,7 +100,6 @@ var testSuccess = function() {
   }
 };
 var challengeSeed = challengeSeed || null;
-var tests = tests || [];
 var allSeeds = '';
 (function() {
   challengeSeed.forEach(function(elem) {
diff --git a/public/js/lib/coursewares/iFrameScripts_0.0.2.js b/public/js/lib/coursewares/iFrameScripts_0.0.2.js
deleted file mode 100644
index 5856d50b19..0000000000
--- a/public/js/lib/coursewares/iFrameScripts_0.0.2.js
+++ /dev/null
@@ -1,19 +0,0 @@
-(function() {
-    var expect = chai.expect;
-    var tests = parent.tests;
-
-    for (var i = 0; i < tests.length; i++) {
-        var thisTest = true;
-        try {
-            eval(parent.tests[i]);
-        } catch (err) {
-            allTestsGood = false;
-            thisTest = false;
-            parent.postError(JSON.stringify(err.message.split(':').shift()));
-        } finally {
-            if (thisTest) {
-                parent.postSuccess(JSON.stringify(tests[i].split(',').pop().replace(/\'/g, '').replace(/\)/, '')));
-            }
-        }
-    }
-})();
diff --git a/public/js/lib/coursewares/iFrameScripts_0.0.3.js b/public/js/lib/coursewares/iFrameScripts_0.0.3.js
new file mode 100644
index 0000000000..7691582f4a
--- /dev/null
+++ b/public/js/lib/coursewares/iFrameScripts_0.0.3.js
@@ -0,0 +1,20 @@
+(function() {
+  var expect = chai.expect;
+  var tests = parent.tests;
+  var editor = parent.editorValueForIFrame;
+
+  for (var i = 0; i < tests.length; i++) {
+    var thisTest = true;
+    try {
+      eval(parent.tests[i]);
+    } catch (err) {
+      allTestsGood = false;
+      thisTest = false;
+      parent.postError(JSON.stringify(err.message.split(':').shift()));
+    } finally {
+      if (thisTest) {
+        parent.postSuccess(JSON.stringify(tests[i].split(',').pop().replace(/\'/g, '').replace(/\)/, '')));
+      }
+    }
+  }
+})();
diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index 79d5d1e8ba..dfe705def4 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -594,6 +594,9 @@
         "Now see if you can make sure the h2 element is rendered in the color red without removing the \"blue-text\" class, doing an in-line styling, or changing the sequence of CSS class declarations."
       ],
       "tests": [
+        "assert(new RegExp('.blue-text', 'gi').test(editor), 'Ensure you implemented the css class \".blue-text\"');",
+        "assert(new RegExp('.urgently-red', 'gi').test(editor), 'Ensure you implemented the css class \".urgently-red\"');",
+        "assert(new RegExp('blue !important', 'gi').test(editor), 'Ensure you added the \"!important\" declaration!');",
         "assert($('h2').hasClass('blue-text'), 'Your h2 element should have the class \"blue-text\".')",
         "assert($('h2').hasClass('urgently-red'), 'Your h2 element should have the class \"urgently-red\".')",
         "assert($('h2').css('color') === 'rgb(255, 0, 0)', 'Your h2 element should be red.')"

From 5fd4ce00303a1cefff4eabbe86d068456b0c2545 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 08:29:35 -0400
Subject: [PATCH 07/17] Fix typo in import a font family, closes # 698

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

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index dfe705def4..fde44601b0 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -454,7 +454,7 @@
       "description": [
         "Make all paragraph elements use the \"Monospace\" font.",
         "You can set an element's font by using the <code>font-family</code> attribute.",
-        "For example, if you wanted to set your h2 element's font to \"San-serif\", you would use the following CSS: <code>h2 { font-family: 'San-serif'; }</code>"
+        "For example, if you wanted to set your h2 element's font to \"Sans-serif\", you would use the following CSS: <code>h2 { font-family: 'Sans-serif'; }</code>"
       ],
       "tests": [
         "assert($('p').css('font-family').match(/monospace/i), 'Your paragraph elements should use the font \"Monospace\".')"

From c61a95eae5d0a87d74333e06d083c4f6874f8f14 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 08:32:27 -0400
Subject: [PATCH 08/17] Consistent use of <code>img</code> in add borders
 challenge, closes #670

---
 seed_data/challenges/basic-html5-and-css.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index fde44601b0..80dabd999f 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -743,8 +743,8 @@
       ],
       "tests": [
         "assert($('img').hasClass('smaller-image'), 'Your <code>img</code> element should have the class \"smaller-image\".')",
-        "assert($('img').hasClass('thick-green-border'), 'Your image element should have the class \"thick-green-border\".')",
-        "assert(parseInt($('img').css('border-left-width')) > 8, 'Your image should have a border with a width of 10 pixels.')"
+        "assert($('img').hasClass('thick-green-border'), 'Your <code>img</code> element should have the class \"thick-green-border\".')",
+        "assert(parseInt($('img').css('border-left-width')) > 8, 'Your <code>img</code> should have a border with a width of 10 pixels.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",

From 14ff6d5306d51637c1654d83bfb8589c8f7d8b31 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 08:34:22 -0400
Subject: [PATCH 09/17] Fix typo in waypoint name responsively style radio
 buttons, closes #667

---
 seed_data/challenges/bootstrap.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed_data/challenges/bootstrap.json b/seed_data/challenges/bootstrap.json
index 67076c6aa8..dfaa714d10 100644
--- a/seed_data/challenges/bootstrap.json
+++ b/seed_data/challenges/bootstrap.json
@@ -1044,7 +1044,7 @@
     },
     {
       "_id": "bad87fee1348bd9aedb08845",
-      "name": "Waypoint: Responsively Style a Radio Buttons",
+      "name": "Waypoint: Responsively Style Radio Buttons",
       "difficulty": 0.059,
       "description": [
         "Wrap all of your radio buttons within a <code>&#60;div class='row'&#62;</code> element. Then wrap each of them within a <code>&#60;div class='col-xs-6'&#62;</code> element.",

From 3fbf84cf21843f04d5d2e5676b098517c60bdcea Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 09:08:44 -0400
Subject: [PATCH 10/17] Ensures a button has been fully declared, fixes #683

---
 seed_data/challenges/basic-html5-and-css.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index 80dabd999f..b30e226e12 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -1571,12 +1571,12 @@
       "name": "Waypoint: Add a Submit Button to a Form",
       "difficulty": 0.041,
       "description": [
-        "Add a submit button to your form field.",
+        "Add a submit button to your form field with type <code>submit</code> and a test value of \"Submit\".",
         "Let's add a submit button to your form. Clicking this button will send the data from your form to the URL you specified with your form's <code>action</code> attribute.",
         "Here's an example submit button: <code>&#60;button type='submit'&#62;this button submits the form&#60;/button&#62;<code>"
       ],
       "tests": [
-        "assert($('button').length > 0, 'Your form should have a button inside it.')"
+        "assert(new RegExp('<button type=.submit.>Submit</button>', 'gi').test(editor), 'Make sure you have completely declared your button!');"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",

From 894428f6e21915993d62f6e1028d3701e30af0bf Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 09:13:28 -0400
Subject: [PATCH 11/17] Matches test output hint to instructions for link to
 external pages challenge, closes #677

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

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index b30e226e12..55f3b78af1 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -914,7 +914,7 @@
         "Here's an example: <code>&#60;p&#62;Here's a &#60;a href='http://freecodecamp.com'&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>"
       ],
       "tests": [
-        "assert((/cat photos/gi).test($('a').text()), 'Your <code>anchor</code> element should have the anchor text of \"See my cat photos\"')",
+        "assert((/cat photos/gi).test($('a').text()), 'Your <code>anchor</code> element should have the anchor text of \"cat photos\"')",
         "assert($('a').filter(function(index) { return /com/gi.test($('a').attr('href')); }).length > 0, 'You need an <code>anchor</code> element that links to <code>http&#58;//catphotoapp.com<code>.')"
       ],
       "challengeSeed": [

From 08cdc103630b9a95f371557718d40a2b00dc7d7a Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 09:18:46 -0400
Subject: [PATCH 12/17] Updates test hint display, closes #673

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

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index 55f3b78af1..79cb1546af 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -976,7 +976,7 @@
       ],
       "tests": [
         "assert((/photo/gi).test($('a').text()), 'You need an <code>anchor</code> element that links to \"catphotoapp.com\".')",
-        "assert($('a').filter(function(index) { return /photo/gi.test($('a')[index]); }).length === 1, 'Your <code>anchor</code> element should have the anchor text of \"See my cat photos\"')",
+        "assert($('a').filter(function(index) { return /photo/gi.test($('a')[index]); }).length === 1, 'Your <code>anchor</code> element should have the anchor text of \"cat photos\"')",
         "assert($('a').parent().is('p'), 'Your anchor element should be wrapped within a paragraph element.')"
       ],
       "challengeSeed": [

From 94a303b42baaf69eb6a7164b9d3a586c7f3bc30e Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 09:49:09 -0400
Subject: [PATCH 13/17] Betters tests for borders challenge, closes #572.

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

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index 79cb1546af..4f5cf46c66 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -744,7 +744,7 @@
       "tests": [
         "assert($('img').hasClass('smaller-image'), 'Your <code>img</code> element should have the class \"smaller-image\".')",
         "assert($('img').hasClass('thick-green-border'), 'Your <code>img</code> element should have the class \"thick-green-border\".')",
-        "assert(parseInt($('img').css('border-left-width')) > 8, 'Your <code>img</code> should have a border with a width of 10 pixels.')"
+        "assert(parseInt($('img').css('border-width')) >= 9 && new RegExp('solid').test($('img').css('border-style')), 'You need to specify a border width of 10px and a border style of \"solid\".')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",

From 625167baf3e613ff3c0f531e6aaa5baf0e1bab3c Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 11:02:41 -0400
Subject: [PATCH 14/17] Unifies styling in instructions, closes #638

---
 seed_data/challenges/bootstrap.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed_data/challenges/bootstrap.json b/seed_data/challenges/bootstrap.json
index dfaa714d10..a31eae551d 100644
--- a/seed_data/challenges/bootstrap.json
+++ b/seed_data/challenges/bootstrap.json
@@ -1224,7 +1224,7 @@
       "name": "Waypoint: Style Text Inputs as Form Controls",
       "difficulty": 0.061,
       "description": [
-        "Give your form's text input field a class of \"form-control\". Give your form's submit button the classes \"btn btn-primary\" and give it the Font Awesome icon of \"fa-paper-plane\"."
+        "Give your form's text input field a class of <code>form-control</code>. Give your form's submit button the classes <code>btn btn-primary</code> and give it the Font Awesome icon of <code>fa-paper-plane</code>."
       ],
       "tests": [
         "assert($('.btn-primary').length > 1, 'Give the submit button in your form the classes \"btn btn-primary\".')",

From 8633315e7422a2a288e9f46082d262cca9f083ee Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 11:13:42 -0400
Subject: [PATCH 15/17] Fixes test, closes #699

---
 seed_data/challenges/basic-html5-and-css.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index 4f5cf46c66..8626a0e7b1 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -594,9 +594,9 @@
         "Now see if you can make sure the h2 element is rendered in the color red without removing the \"blue-text\" class, doing an in-line styling, or changing the sequence of CSS class declarations."
       ],
       "tests": [
-        "assert(new RegExp('.blue-text', 'gi').test(editor), 'Ensure you implemented the css class \".blue-text\"');",
-        "assert(new RegExp('.urgently-red', 'gi').test(editor), 'Ensure you implemented the css class \".urgently-red\"');",
-        "assert(new RegExp('blue !important', 'gi').test(editor), 'Ensure you added the \"!important\" declaration!');",
+        "assert(new RegExp('.blue-text', 'gi').test(editor), 'Ensure you implemented the css class \".blue-text\"')",
+        "assert(new RegExp('.urgently-red', 'gi').test(editor), 'Ensure you implemented the css class \".urgently-red\"')",
+        "assert(new RegExp('red !important', 'gi').test(editor), 'Ensure you added the \"!important\" declaration!')",
         "assert($('h2').hasClass('blue-text'), 'Your h2 element should have the class \"blue-text\".')",
         "assert($('h2').hasClass('urgently-red'), 'Your h2 element should have the class \"urgently-red\".')",
         "assert($('h2').css('color') === 'rgb(255, 0, 0)', 'Your h2 element should be red.')"

From aa6ae15d4065633b640dd29cc854404e36557a57 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 11:21:18 -0400
Subject: [PATCH 16/17] Fixes typo, closed #700

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

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index 8626a0e7b1..45b7257cde 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -1103,7 +1103,7 @@
       ],
       "tests": [
         "expect($('a').children('img').length, 'Wrap your image element inside an anchor element that has its <code>href</code> attribute set to \"#\"').to.equal(1);",
-        "expect(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Make sure to specify the \"src\" attritube as \"#\"').to.be.true;"
+        "expect(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Make sure to specify the \"src\" attribute as \"#\"').to.be.true;"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",

From 731cd57e8e15d66f36dc6b43e0a7e74ec45f1c90 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 28 May 2015 11:32:41 -0400
Subject: [PATCH 17/17] closes #702

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

diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index 45b7257cde..ece940fd01 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -1425,7 +1425,7 @@
       "name": "Waypoint: Add Placeholder Text to a Text Field",
       "difficulty": 0.039,
       "description": [
-        "Add the placeholder text \"type a cat photo URL here\" to your text field.",
+        "Add the placeholder text \"cat photo URL\" to your text field.",
         "Placeholder text will appear in your text field before your user has inputed anything.",
         "For example: <code>&#60;input type='text' placeholder='this is placeholder text'&#62;</code>"
       ],