Merge remote-tracking branch 'upstream/staging' into patch-3

.gitignore

@@ -30,5 +30,20 @@ coverage
 .remote-sync.json
 
 server/*.bundle.js
-public/js/*.bundle.js
+public/js/bundle*
+
 *.map
+
+// revision manifest
+server/rev-manifest.json
+server/manifests/*
+!server/manifests/README.md
+
+public/js/main*
+public/js/commonFramework*
+public/js/sandbox*
+public/js/iFrameScripts*
+public/js/plugin*
+public/css/main*
+
+server/rev-manifest.json

CONTRIBUTING.md

@@ -0,0 +1,2 @@
+We're getting a lot of duplicate issues and bug reports that just aren't reporting actual bugs.
+So, before you submit your issue, please read the [Help I've Found a Bug](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-I've-Found-a-Bug) wiki page.

README.md

@@ -66,6 +66,8 @@ bower install
 # Create a .env file and populate it with the necessary API keys and secrets:
 touch .env
 
+# Install Gulp globally
+npm install -g gulp
 ```
 
 Edit your .env file with the following API keys accordingly (if you only use email login, only the MONGOHQ_URL, SESSION_SECRET, MANDRILL_USER and MANDRILL_PASSWORD fields are necessary. Keep in mind if you want to use more services you'll have to get your own API keys for those services.
@@ -112,6 +114,11 @@ DEBUG=true
 # Start the mongo server
 mongod
 
+# Create your mongo database. 
+# Type "mongo" in your terminal to access the mongo shell 
+use freecodecamp
+# Exit the mongo shell with control + d
+
 # Seed your database with the challenges
 node seed/
 

client/README.md

@@ -1,4 +1,4 @@
-This is the entry point for the client
+This is the entry point for the client code
 Code that should only run on the client should be put here.
 
 NOTE(berks): For react specific stuff this should be the entry point