Merge branch 'master' into gaspar

# Conflicts:
#	05-NumPy&Pandas.ipynb
#	07-LinearAlgebra&Learning.ipynb

06-LinearAlgebra&Statistics.ipynb → 07-LinearAlgebra&Learning.ipynb.orig

@@ -4,8 +4,8 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# 2 ScyPy\n",
-    "## 2.3 Algebra Lineal"
+    "# 2. SciPy\n",
+    "## 2.5 MatPlotlib"
    ]
   },
   {
@@ -19,7 +19,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## 2.4 Estadistica"
+    "## 2.6 Machine Learning (scikit-learn)"
    ]
   },
   {
@@ -46,7 +46,11 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8rc1"
+<<<<<<< HEAD:07-MatPlotlib&Learning.ipynb
+   "version": "3.6.7"
+=======
+   "version": "3.5.3"
+>>>>>>> master:07-LinearAlgebra&Learning.ipynb
   }
  },
  "nbformat": 4,

README.md

@@ -5,5 +5,5 @@
 ```bash
 sudo apt-get install python3 pip3
 python3 -m pip install --upgrade pip
-pip3 install jupyter
+pip3 install jupyter numpy pandas matplotlib sklearn
 ```