rebase from mnml mistakes source

_posts/teaching/2018-10-30-Python.md

@@ -1,5 +1,6 @@
 ---
 layout: single
+<<<<<<< HEAD
 title: "Python 101 Course"
 categories: teaching
 tags: teaching python programming introductory-course curriculum-development
@@ -41,4 +42,20 @@ The course structure balanced theoretical instruction with hands-on practical co
   The focus was on providing the essential toolkit for tackling subsequent IoT-related programming tasks.
   </div>
   <div style="clear: both;"></div>
-</div>
+</div>
+=======
+title:  "Lecture: Python 101"
+categories: teaching
+tags: teaching coding 
+excerpt: "Teaching the basics of python."
+header:
+  teaser: assets/images/teaching/py.png
+---
+
+![logo](\assets\images\teaching\py.png){: .align-left style="padding:0.1em; width:5em"}
+The "Python 101"-Lecture was held within the context of the [IOT](/teaching/IOT/) lecture, held in winter semester 2018.
+Over the course of four classes, we tought an extensive introduction to the [`Python`](https://www.python.org/) programming language.
+Not only was the cource slides developed by me and my collegue, we also shared the lectures in front of about 200 students.
+
+There was also a practical part of the course, which allowed students to the practical acquisition of programming skills in the `Python` programming language.
+>>>>>>> d0fa738f (rebase from mnml mistakes source)