Fixed mismerge

Author: sherrym

0_tf_hello_world.ipynb

@@ -4,7 +4,8 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "You can use `ctrl-enter` to execute each snippet of code.  The first snippet will check that TensorFlow is installed. "
+    "You can press `shift + enter` to quickly advance through each line of a notebook. Try it now!\n",
+    "This snippet of Python creates an extremely simple graph and runs."
    ]
   },
   {
@@ -15,28 +16,19 @@
    },
    "outputs": [],
    "source": [
-    "import tensorflow as tf"
+    "import tensorflow as tf\n",
+    "import matplotlib\n",
+    "\n",
+    "hello = tf.constant('Hello, TensorFlow!')\n",
+    "sess = tf.Session()\n",
+    "print(sess.run(hello))"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Now, create an extremely simple graph and run it!"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
-   "outputs": [],
-   "source": [
-    "hello = tf.constant('Hello, TensorFlow!')\n",
-    "sess = tf.Session()\n",
-    "print(sess.run(hello)) \n",
-    "print tf.__version__"
+    "If you see \"Hello, TensorFlow!\", everything is working well."
    ]
   }
  ],