Merge branch 'master' into port-option-for-npm-start

Author: chocnut

README.md

@@ -80,7 +80,7 @@ It correctly bundles React in production mode and optimizes the build for the be
 The build is minified and the filenames include the hashes.<br>
 Your app is ready to be deployed!
 
-## How Do I?...
+## How Do I…?
 
 The generated project will include a guide in its README.<br>
 You can also read its latest version [here](https://github.com/facebookincubator/create-react-app/blob/master/template/README.md).

global-cli/index.js

@@ -54,17 +54,16 @@ var argv = require('minimist')(process.argv.slice(2));
  */
 var commands = argv._;
 if (commands.length === 0) {
+  if (argv.version) {
+    console.log('create-react-app version: ' + require('./package.json').version);
+    process.exit();
+  }
   console.error(
     'Usage: create-react-app <project-directory> [--verbose]'
   );
   process.exit(1);
 }
 
-if (argv.version) {
-  console.log('create-react-app version: ' + require('./package.json').version);
-  process.exit();
-}
-
 createApp(commands[0], argv.verbose, argv['scripts-version']);
 
 function createApp(name, verbose, version) {

template/README.md

@@ -7,7 +7,7 @@ We are always open to [your feedback](https://github.com/facebookincubator/creat
 
 ## Folder Structure
 
-After creation, you project should look like this:
+After creation, your project should look like this:
 
 ```
 my-app/