Merge branch 'master' into staging

Conflicts: seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
parent db1233c7d4
commit 1bb9951d04
2 changed files with 5 additions and 2 deletions
--- a/bonfireMDNlinks.js
+++ b/bonfireMDNlinks.js
@@ -12,6 +12,7 @@ var links =
  "Currying": "https://leanpub.com/javascript-allonge/read#pabc",
  "Smallest Common Multiple": "https://www.mathsisfun.com/least-common-multiple.html",
  "Permutations": "https://www.mathsisfun.com/combinatorics/combinations-permutations.html",
+  "HTML Entities": "http://dev.w3.org/html5/html-author/charref",

 	// ========= GLOBAL OBJECTS
 	"Global Array Object" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array",