fix conflicts

Author: JeffKatzy

index.ipynb

@@ -20,7 +20,7 @@
    "source": [
     "In the past few lessons, we have learned about working with different types of data in Python: strings, numbers (ints and floats), and booleans.  Now let's put that knowledge into action.\n",
     "\n",
-    "In this lesson we'll imagine that just met Art Vandelay, a CEO of his own travel agency, Vandelay Industries.  He gave us his business card, and we would like to use our knowledge of strings to format his information properly before we file it away."
+    "In this lesson we'll imagine that at a nice social gathering you exchanged business cards with a few people.  One of the business cards belongs to Art Vandelay, a new travel agent. You want to use your programming skills to format this information correctly. "
    ]
   },
   {
@@ -57,9 +57,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Yea, he may not be our first choice, but we said he'd give us a discount so we move ahead.  Plus his poor formatting on his card will give us practice with strings.  \n",
+    "Yea, he may not be the best person to get to know.  But we know that when people fill out forms, they misenter information all of the time.\n",
     "\n",
-    "And we know that a lot of information online is mistyped.  Just think of when all the times people misenter information on forms.  So let's get to work."
+    "So as data scientists, we often need to clean and organize data to then make sense of it.  Let's get to work. "
    ]
   },
   {
@@ -189,9 +189,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'art.vandelay@vandelay.co'"
+      ]
+     },
+     "execution_count": 1,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "\"art.vandelay@vandelay.co\" # False"
    ]