Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging

This commit is contained in:
Berkeley Martinez
2015-08-09 22:58:46 -07:00
7 changed files with 383 additions and 265 deletions

View File

@@ -270,9 +270,9 @@
"title": "Add Two Numbers with JavaScript",
"difficulty": "9.98141",
"description": [
"In JavaScript whole numbers (called integers) can be easily used to preform mathematical functions",
"Let's try a few of the most commonly used ones now",
"We use <code>+</code>for addition",
"In JavaScript whole numbers (called integers) can be easily used to perform mathematical functions.",
"Let's try a few of the most commonly used ones now.",
"We use <code>+</code>for addition.",
"Replace the <code>0</code>with correct number to achieve the result in the comment."
],
"tests": [
@@ -293,9 +293,9 @@
"title": "Subtract One Number from Another with JavaScript",
"difficulty": "9.98142",
"description": [
"In JavaScript whole numbers (called integers) can be easily used to preform mathematical functions",
"Let's try a few of the most commonly used ones now",
"We use <code>-</code>for subtraction",
"In JavaScript whole numbers (called integers) can be easily used to perform mathematical functions.",
"Let's try a few of the most commonly used ones now.",
"We use <code>-</code>for subtraction.",
"Replace the <code>0</code>with correct number to achieve the result in the comment."
],
"tests": [
@@ -316,9 +316,9 @@
"title": "Multiply Two Numbers with JavaScript",
"difficulty": "9.98143",
"description": [
"In JavaScript whole numbers (called integers) can be easily used to preform mathematical functions",
"Let's try a few of the most commonly used ones now",
"We use <code>*</code>for multiplication",
"In JavaScript whole numbers (called integers) can be easily used to perform mathematical functions.",
"Let's try a few of the most commonly used ones now.",
"We use <code>*</code>for multiplication.",
"Replace the <code>0</code>with correct number to achieve the result in the comment."
],
"tests": [
@@ -339,9 +339,9 @@
"title": "Divide One Number by Another with JavaScript",
"difficulty": "9.9814",
"description": [
"In JavaScript whole numbers (called integers) can be easily used to preform mathematical functions",
"Let's try a few of the most commonly used ones now",
"We use <code>/</code>for division",
"In JavaScript whole numbers (called integers) can be easily used to perform mathematical functions.",
"Let's try a few of the most commonly used ones now.",
"We use <code>/</code>for division.",
"Replace the <code>0</code>with correct number to achieve the result in the comment."
],
"tests": [
@@ -362,7 +362,7 @@
"title": "Create Decimal Numbers with JavaScript",
"difficulty": "9.9815",
"description": [
"in JavaScript we can can work with decimal numbers",
"In JavaScript we can can work with decimal numbers.",
"Let's create a variable <code>myDecimal</code> and give it a decimal value."
],
"tests": [