Merge branch 'dev'

Author: code-warrior

README.md

@@ -4,14 +4,14 @@
 All the required Node modules need to be installed before you can use this template. From the root folder of this project, type `npm install`. This will create a folder called `node_modules` and download the plugins listed under the `devDependencies` section in the `package.json` file. If you encounter an `ERR!` message about `EACCES`, then you’ll need to run the command as the super user: `sudo npm install`. Because the 13 Gulp tasks amount to about 220MB, expect to wait.
 
 ## Tasks
-Typing `gulp --tasks` will provide you with a list of tasks included in `gulpfile.js`. Tasks such as `build` and `serve` invoke other tasks and are nested in the output of `gulp --tasks`.
+Typing `gulp --tasks`, or simply `gulp`, will provide you with a list of tasks included in `gulpfile.js`. Tasks such as `build` and `serve` invoke other tasks and are nested in the output of `gulp --tasks`.
 
 Each task can be run on its own. For example, if all you want to do is validate your HTML, you can type `gulp validateHTML`, and if the task runs to completion without any messages, it means your HTML is valid and W3-compliant.
 
 Above each task in the `gulpfile.js` file is an elaborate comment discussing what each task does.
 
 ## Individual Tasks as Branches
-Each of the 13 tasks has been broken out into its own branch, and the full `gulpfile` is available without comments and without variables. You can view all the branches with `git branch -r`.
+Each of the 13 tasks has been broken out into its own branch, and the full `gulpfile` is available without comments and without variables. You can view all the branches with `git branch -a`.
 
 ## Running the Project
 For development, run `gulp serve`, which runs multiple development-related tasks, then launches your default browser and listens for changes. Gulp keeps you informed via The Terminal. You can now work on your project as you normally would. Each time you save a file, your browser will refresh so you don’t have to.

config.json

@@ -1,45 +1,12 @@
 {
-    "browser": {
-        "safari": "safari",
-        "firefox": "firefox",
-        "chrome": "google chrome",
-        "opera": "opera"
-    },
-
-    "baseFolders": {
-        "dev": "dev/",
-        "tmp": "temp/",
-        "prod": "prod/"
-    },
-
-    "scaffoldFolders": {
-        "html": "html/",
-        "js": "scripts/",
-        "styles": "styles/",
-        "images": "img/"
-    },
-
-    "filenames": {
-        "js": {
-            "main": "app.js",
-            "all": "*.js",
-            "grid": "grid.js"
-        },
-        "html": {
-            "all": "*.html",
-            "allNested": "**/*.html"
-        },
-        "sass": "main.scss"
-    },
-
-    "colors": {
-        "default": "\u001b[39m",
-        "red": "\u001b[31m",
-        "green": "\u001b[32m",
-        "yellow": "\u001b[33m",
-        "blue": "\u001b[34m",
-        "magenta": "\u001b[35m",
-        "cyan": "\u001b[36m",
-        "white": "\u001b[37m"
-   }
+  "colors": {
+    "default": "\u001b[39m",
+    "red": "\u001b[31m",
+    "green": "\u001b[32m",
+    "yellow": "\u001b[33m",
+    "blue": "\u001b[34m",
+    "magenta": "\u001b[35m",
+    "cyan": "\u001b[36m",
+    "white": "\u001b[37m"
+  }
 }