fixing merge conflicts

.learn

@@ -1 +1,9 @@
 jupyter_notebook: true
+tags:
+  - jupyter
+  - python
+
+languages:
+  - python
+
+resources: 0

README.md

@@ -157,8 +157,3 @@ int("7285553334") + 2 # 7285553336
 ### Summary
 
 Your first lab done!  Sweet.  In this lab, you practiced working with string methods to operate on and answer questions about strings.  You wrote methods that return Booleans.  And you changed strings to an `int` to then perform addition.  So much of working with data, is ensuring that our data is properly formatted so we can then operate on it and in this lab you saw how to use code to just that.
-
-
-```python
-
-```

requirements.txt

@@ -0,0 +1,2 @@
+pandas
+Unittest2

test/index_test.py

@@ -0,0 +1,6 @@
+import unittest2 as unittest
+from ipynb.fs.full.index import *
+
+class TestPythonDatatypes(unittest.TestCase):
+    def test_passes(self):
+        self.assertEqual(True, True)