Merge branch 'master' of https://github.com/jonathandelgado/atom into jonathandelgado-master

src/atom.coffee

@@ -669,6 +669,7 @@ class Atom extends Model
     @windowEventHandler?.unsubscribe()
 
   openInitialEmptyEditorIfNecessary: ->
+    return unless @config.get('core.openEmptyEditorOnStart')
     if @getLoadSettings().initialPaths?.length is 0 and @workspace.getPaneItems().length is 0
       @workspace.open(null)
 

src/config-schema.coffee

@@ -89,6 +89,10 @@ module.exports =
           'windows1258',
           'windows866'
         ]
+      openEmptyEditorOnStart:
+        description: 'Automatically opens an empty editor when atom starts.'
+        type: 'boolean'
+        default: true
 
   editor:
     type: 'object'