Merge remote-tracking branch 'origin/staging' into staging

This commit is contained in:
benmcmahon100
2015-08-17 22:57:36 +01:00

View File

@ -924,7 +924,7 @@
"title": "Generate Random Whole Numbers within a Range", "title": "Generate Random Whole Numbers within a Range",
"difficulty":"9.9829", "difficulty":"9.9829",
"description":[ "description":[
"We can use a certain mathematical expression to get a random number between between two numbers.", "We can use a certain mathematical expression to get a random number between two numbers.",
"<code>Math.floor(Math.random() * (max - min + 1)) + min</code>", "<code>Math.floor(Math.random() * (max - min + 1)) + min</code>",
"By using this we can control the output of a random number." "By using this we can control the output of a random number."
], ],
@ -958,7 +958,7 @@
"We can use if statements in JavaScript to only execute code if a certain condition is met.", "We can use if statements in JavaScript to only execute code if a certain condition is met.",
"if statements require some sort of boolean condition evaluate.", "if statements require some sort of boolean condition evaluate.",
"Example:", "Example:",
"<code> if (1 == 2) {", "<code> if (1 == 2) {</code>",
"<code>&thinsp;&thinsp;return(true);</code>", "<code>&thinsp;&thinsp;return(true);</code>",
"<code>}</code>", "<code>}</code>",
"<code>else {</code>", "<code>else {</code>",