Merge remote-tracking branch 'upstream/master'

README.md

@@ -149,17 +149,6 @@ List of Packages
 | supertest                       | HTTP assertion library.                                              |
 | multiline                       | Multi-line strings for the generator.                                |
 
-
-Changelog
----------
-
-### 0.1.0 (December 24, 2014)
-- Improved how unique emails and usernames are handled (with Express-validator)
-- Added a tweet button to challenge completion model
-- Refactored all views to get rid of any hard-coded challenge information (to make for a better forking experience)
-- Installed Helmet to maximize security of application
-- Added .env and removed all trace of API keys from git history
-
 License
 -------
 

seed_data/coursewares.json

@@ -587,19 +587,6 @@
     "challengeType": 2,
     "tests": []
   },
-  {
-    "_id": "bd7153d8c441eddfaeb5bd2f",
-    "name": "Manage Data with MongoDB",
-    "difficulty": 0.42,
-    "challengeSeed": "114685061",
-    "description": [
-      "MongoDB is a popular NoSQL (Not Only SQL) database used by many JavaScript apps.",
-      "Go to <a href='http://try.mongodb.org/' target='_blank'>http://try.mongodb.org/</a> and work through their interactive MongoDB tutorial."
-    ],
-    "challengeType": 2,
-    "tests": []
-  },
-
   {
     "_id": "bd7140d8c441eddfaeb5bdef",
     "name": "Manage Source Code with Git",

seed_data/field-guides.json

@@ -183,7 +183,7 @@
   },
   {
     "_id": "bd7158d9c437eddfaeb5bdef",
-    "name": "What's pair programming, and what's so special about it?",
+    "name": "What is pair programming, and why is it special?",
     "description": [
       "<div class=\"text-left col-xs-12 col-md-10 col-md-offset-1\">",
       "    <p class=\"landing-p\">Pair programming is where two people code together on one computer. You discuss different approaches to solving problems, and keep each other motivated. The result is better code than either of you could have written by yourselves. Because of its benefits, many engineers pair program full time. And it's the best way to learn coding. Thanks to tools that allow two people to share mouse and keyboard inputs, you can pair program with a friend without needing to be in the same room.</p>",
@@ -487,7 +487,7 @@
   },
   {
     "_id": "bd7158d9c451eddfaeb5bdef",
-    "name": "Free Code Camp's Privacy Policy",
+    "name": "The Free Code Camp Privacy Policy",
     "description": [
       "<div class='col-xs-12 col-sm-10 col-sm-offset-1'>",
       "<p>Free Code Camp is committed to respecting the privacy of visitors to our web sites and web applications. The guidelines below explain how we protect the privacy of visitors to FreeCodeCamp.com and its features.</p>",