resolve conflicts

README.md

@@ -6,7 +6,7 @@
 This is the official content repository for the online course ['Cubes & Clouds - Cloud Native Open Data Sciences for Earth Observation'](https://eo-college.org/courses/cubes-and-clouds) hosted on EO College.
 
 ## Description
-The Massive Open Online Course **'Cubes & Clouds - Cloud Native Open Data Sciences for Earth Observation'** teaches the concepts of data cubes, cloud platforms and open science in the context of earth observation. 
+The Massive Open Online Course **'Cubes & Clouds - Cloud Native Open Data Sciences for Earth Observation'** teaches the concepts of data cubes, cloud platforms and open science in the context of earth observation. Here's the video on [youtube](https://www.youtube.com/watch?v=lCC0o6kNFt0) in case it doesn't play here.
 
 https://user-images.githubusercontent.com/51962348/234564489-98a56dd2-1359-4972-ad3c-0f0f2d4b450e.mp4
 

environment.yml

@@ -25,5 +25,7 @@ dependencies:
     - rio-stac
     - jupyter-book
     - sphinx-exercise
+    - rio_stac
+    - scikit-learn
     - openeo-processes-dask[implementations]
     - openeo-pg-parser-networkx

lectures/1.3_openscience/1.3.3_openscienceineo.md

@@ -11,7 +11,7 @@
 
 Finally let's see how open science principles are applied in the field of geospatial, earth observation and EO cloud platforms. To begin we will have a look at the open science journey and a research project that has adapted openness and the FAIR principles very well. Then we will have a look at the role open science plays in today's geospatial and EO world.
 
-This drag and drop game asks you to connect the tasks to their respecitve step within the open science journey. If you hover over the icons, their description will pop up.
+This drag and drop game asks you to connect the tasks to their respective step within the open science journey. If you hover over the icons, their description will pop up.
 
 <iframe src="https://create.eo-college.org/wp-admin/admin-ajax.php?action=h5p_embed&id=5" width="958" height="588" frameborder="0" allowfullscreen="allowfullscreen" title="Cubes&amp;Clouds: Open Science Journey"></iframe><script src="https://create.eo-college.org/wp-content/plugins/h5p/h5p-php-library/js/h5p-resizer.js" charset="UTF-8"></script>
 

lectures/2.1_data_discovery/2.1_data_discovery.md

@@ -59,7 +59,7 @@ Datacube refers to a multidimensional representation of data that incorporates s
 
 For Earth observation data discovery, it is essential to know about various used catalog protocols that define standardized methods and formats for organizing, describing, and accessing Earth observation data catalogs. 
 
-Some commonly used protocols shared between diffent platforms include **OpenSearch**, **OGC CSW**, **OGC API - Records**, **STAC**, **OData** and more.
+Some commonly used protocols shared between diffent platforms include **OpenSearch**, **OGC CSW**, **OGC API - Features**, **OGC API - Records**, **STAC**, **OData** and more.
 
 ## OpenSearch
 
@@ -99,7 +99,7 @@ The STAC specification is divided into three main parts:
 - STAC API specification for dynamic catalogs.
 - STAC extensions (both for static STAC and the STAC API)
 
-All these components are fairly independant, but all components work together and use links to express the relationship between them so that eventually clients can traverse through them. The links to the actual spatio-temporal data files that the STAC metadata describes are handled specifically and are called STAC Assets. Assets can be made available in Items and Collections.
+All these components are fairly independent, but all components work together and use links to express the relationship between them so that eventually clients can traverse through them. The links to the actual spatio-temporal data files that the STAC metadata describes are handled specifically and are called STAC Assets. Assets can be made available in Items and Collections.
 
 
 ![STAC Hierarchy](assets/stac_hierarchy.png "STAC Hierarchy") <br>