diff --git a/sami/django/#django.org# b/sami/django/#django.org#
new file mode 100644
index 0000000..271ff85
--- /dev/null
+++ b/sami/django/#django.org#
@@ -0,0 +1,28 @@
+*** Django #1: Introduction
+**** Objective
+     - We will build a IPv6 ULA registry with Django in the
+       next lectures
+**** Lecture content
+     - Create a new directory in your learning cirle repository named "django"
+     - Write down the answers to the following questions in django/django.org
+     - Research and answer the following questions: (1/2 of the time)
+       - What is IPv6 ULA?
+	 - addresses that are only ment to be used in privte segment. 
+	 - unique Local address they can be easly identified by FD00::/8 
+	 - equivllent to privte address in v4  
+       - Which registries did exist historically?
+       - How should an IPv6 ULA registry work?
+     - Get started with Django
+       - Create a new python virtual env using `python3 -m venv`
+         - Create the venv in django/venv
+       - Create a file .gitignore in django/
+         - Add 'venv/' (without the quotes to that file
+         - Use magit to verify that the venv is being ignored
+         - Add and commit the .gitignore file
+       - Inside this virtual env, install django using `pip`
+       - Go to https://www.djangoproject.com/
+       - Finish tutorial 1: https://docs.djangoproject.com/en/3.0/intro/tutorial01/
+       - Commit the django code to your repository
+       - Exclude '*.pyc' in the .gitignore
+       - Also exclude the sqlite database
+
diff --git a/sami/django/.#django.org b/sami/django/.#django.org
new file mode 120000
index 0000000..d64e808
--- /dev/null
+++ b/sami/django/.#django.org
@@ -0,0 +1 @@
+sami@afro-linux-lenovo-b50-30.13724:1593172229
\ No newline at end of file
diff --git a/sami/django/.gitignore b/sami/django/.gitignore
new file mode 100644
index 0000000..7f07ff3
--- /dev/null
+++ b/sami/django/.gitignore
@@ -0,0 +1,5 @@
+venv
+
+*.pyc
+
+
diff --git a/sami/django/env/bin/python b/sami/django/env/bin/python
new file mode 120000
index 0000000..b8a0adb
--- /dev/null
+++ b/sami/django/env/bin/python
@@ -0,0 +1 @@
+python3
\ No newline at end of file
diff --git a/sami/django/env/bin/python3 b/sami/django/env/bin/python3
new file mode 120000
index 0000000..ae65fda
--- /dev/null
+++ b/sami/django/env/bin/python3
@@ -0,0 +1 @@
+/usr/bin/python3
\ No newline at end of file
diff --git a/sami/django/env/lib64 b/sami/django/env/lib64
new file mode 120000
index 0000000..7951405
--- /dev/null
+++ b/sami/django/env/lib64
@@ -0,0 +1 @@
+lib
\ No newline at end of file
diff --git a/sami/django/env/pyvenv.cfg b/sami/django/env/pyvenv.cfg
new file mode 100644
index 0000000..bafe8a4
--- /dev/null
+++ b/sami/django/env/pyvenv.cfg
@@ -0,0 +1,3 @@
+home = /usr/bin
+include-system-site-packages = false
+version = 3.7.5
diff --git a/sami/django/mysite/db.sqlite3 b/sami/django/mysite/db.sqlite3
new file mode 100644
index 0000000..93a0f5a
Binary files /dev/null and b/sami/django/mysite/db.sqlite3 differ
diff --git a/sami/django/mysite/manage.py b/sami/django/mysite/manage.py
new file mode 100755
index 0000000..577e446
--- /dev/null
+++ b/sami/django/mysite/manage.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+"""Django's command-line utility for administrative tasks."""
+import os
+import sys
+
+
+def main():
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings')
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/sami/django/mysite/mysite/__init__.py b/sami/django/mysite/mysite/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/sami/django/mysite/mysite/settings.py b/sami/django/mysite/mysite/settings.py
new file mode 100644
index 0000000..dd259dc
--- /dev/null
+++ b/sami/django/mysite/mysite/settings.py
@@ -0,0 +1,130 @@
+"""
+Django settings for mysite project.
+
+Generated by 'django-admin startproject' using Django 2.2.12.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/2.2/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/2.2/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'p+k-n&d40pt2yi@yyq1(u%+b!b4#yloa%1ct%#jibl41x9z1b@'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'mysite.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'mysite.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/2.2/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/2.2/howto/static-files/
+
+STATIC_URL = '/static/'
+
+INSTALLED_APPS = [
+    'polls.apps.PollsConfig',
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+]
diff --git a/sami/django/mysite/mysite/urls.py b/sami/django/mysite/mysite/urls.py
new file mode 100644
index 0000000..cba3a35
--- /dev/null
+++ b/sami/django/mysite/mysite/urls.py
@@ -0,0 +1,22 @@
+"""mysite URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/2.2/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+from django.contrib import admin
+from django.urls import include, path
+
+urlpatterns = [
+    path('polls/', include('polls.urls')),
+    path('admin/', admin.site.urls),
+]
diff --git a/sami/django/mysite/mysite/wsgi.py b/sami/django/mysite/mysite/wsgi.py
new file mode 100644
index 0000000..45e28c9
--- /dev/null
+++ b/sami/django/mysite/mysite/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for mysite project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings')
+
+application = get_wsgi_application()
diff --git a/sami/django/mysite/polls/__init__.py b/sami/django/mysite/polls/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/sami/django/mysite/polls/admin.py b/sami/django/mysite/polls/admin.py
new file mode 100644
index 0000000..3f3d36e
--- /dev/null
+++ b/sami/django/mysite/polls/admin.py
@@ -0,0 +1,7 @@
+# Register your models here.
+
+from django.contrib import admin
+
+from .models import Question
+
+admin.site.register(Question)
diff --git a/sami/django/mysite/polls/apps.py b/sami/django/mysite/polls/apps.py
new file mode 100644
index 0000000..d0f109e
--- /dev/null
+++ b/sami/django/mysite/polls/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class PollsConfig(AppConfig):
+    name = 'polls'
diff --git a/sami/django/mysite/polls/migrations/0001_initial.py b/sami/django/mysite/polls/migrations/0001_initial.py
new file mode 100644
index 0000000..88946ea
--- /dev/null
+++ b/sami/django/mysite/polls/migrations/0001_initial.py
@@ -0,0 +1,32 @@
+# Generated by Django 2.2.12 on 2020-07-03 14:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Question',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('question_text', models.CharField(max_length=200)),
+                ('pub_date', models.DateTimeField(verbose_name='date published')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Choice',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('choice_text', models.CharField(max_length=200)),
+                ('votes', models.IntegerField(default=0)),
+                ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='polls.Question')),
+            ],
+        ),
+    ]
diff --git a/sami/django/mysite/polls/migrations/__init__.py b/sami/django/mysite/polls/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/sami/django/mysite/polls/models.py b/sami/django/mysite/polls/models.py
new file mode 100644
index 0000000..0570fbb
--- /dev/null
+++ b/sami/django/mysite/polls/models.py
@@ -0,0 +1,40 @@
+from django.db import models
+
+# Create your models here.
+
+class Question(models.Model):
+    question_text = models.CharField(max_length=200)
+    pub_date = models.DateTimeField('date published')
+
+
+class Choice(models.Model):
+    question = models.ForeignKey(Question, on_delete=models.CASCADE)
+    choice_text = models.CharField(max_length=200)
+
+    votes = models.IntegerField(default=0)
+
+
+from django.db import models
+
+class Question(models.Model):
+    # ...
+    def __str__(self):
+        return self.question_text
+
+class Choice(models.Model):
+    # ...
+    def __str__(self):
+        return self.choice_text
+
+
+    
+import datetime
+
+from django.db import models
+from django.utils import timezone
+
+
+class Question(models.Model):
+        # ...
+    def was_published_recently(self):
+        return self.pub_date >= timezone.now() - datetime.timedelta(days=1)
diff --git a/sami/django/mysite/polls/tests.py b/sami/django/mysite/polls/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/sami/django/mysite/polls/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/sami/django/mysite/polls/urls.py b/sami/django/mysite/polls/urls.py
new file mode 100644
index 0000000..88a9cac
--- /dev/null
+++ b/sami/django/mysite/polls/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+    path('', views.index, name='index'),
+]
diff --git a/sami/django/mysite/polls/views.py b/sami/django/mysite/polls/views.py
new file mode 100644
index 0000000..8531097
--- /dev/null
+++ b/sami/django/mysite/polls/views.py
@@ -0,0 +1,17 @@
+# from django.shortcuts import render
+
+# Create your views here.
+
+#from django.urls import path
+
+#from . import views
+
+#urlpatterns = [
+ #   path('', views.index, name='index'),
+#]
+
+from django.http import HttpResponse
+
+
+def index(request):
+    return HttpResponse("Hello, world. You're at the polls index.")
diff --git a/sami/django/mysite2/db.sqlite3 b/sami/django/mysite2/db.sqlite3
new file mode 100644
index 0000000..95016af
Binary files /dev/null and b/sami/django/mysite2/db.sqlite3 differ
diff --git a/sami/django/mysite2/manage.py b/sami/django/mysite2/manage.py
new file mode 100755
index 0000000..f7bf114
--- /dev/null
+++ b/sami/django/mysite2/manage.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+"""Django's command-line utility for administrative tasks."""
+import os
+import sys
+
+
+def main():
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite2.settings')
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/sami/django/mysite2/mysite2/__init__.py b/sami/django/mysite2/mysite2/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/sami/django/mysite2/mysite2/settings.py b/sami/django/mysite2/mysite2/settings.py
new file mode 100644
index 0000000..a23a153
--- /dev/null
+++ b/sami/django/mysite2/mysite2/settings.py
@@ -0,0 +1,121 @@
+"""
+Django settings for mysite2 project.
+
+Generated by 'django-admin startproject' using Django 2.2.12.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/2.2/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/2.2/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'sb1cbc!m_esjnb381eh8!+(1$zi-%$h@ewu#3=cog+ls)d%)3z'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = ['2a0a-e5c0-10-bee-7994-d023-5c29-7091.has-a.name']
+		
+
+# Application definition
+
+INSTALLED_APPS = [
+    'polls.apps.PollsConfig',
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'mysite2.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'mysite2.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/2.2/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'Europe/Zurich'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/2.2/howto/static-files/
+
+STATIC_URL = '/static/'
diff --git a/sami/django/mysite2/mysite2/urls.py b/sami/django/mysite2/mysite2/urls.py
new file mode 100644
index 0000000..e7a42d7
--- /dev/null
+++ b/sami/django/mysite2/mysite2/urls.py
@@ -0,0 +1,23 @@
+
+"""mysite2 URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/2.2/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+from django.contrib import admin
+from django.urls import include, path
+
+urlpatterns = [
+    path('polls/', include('polls.urls')),
+    path('admin/', admin.site.urls),
+]
diff --git a/sami/django/mysite2/mysite2/wsgi.py b/sami/django/mysite2/mysite2/wsgi.py
new file mode 100644
index 0000000..916825e
--- /dev/null
+++ b/sami/django/mysite2/mysite2/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for mysite2 project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite2.settings')
+
+application = get_wsgi_application()
diff --git a/sami/django/mysite2/polls/__init__.py b/sami/django/mysite2/polls/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/sami/django/mysite2/polls/admin.py b/sami/django/mysite2/polls/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/sami/django/mysite2/polls/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/sami/django/mysite2/polls/apps.py b/sami/django/mysite2/polls/apps.py
new file mode 100644
index 0000000..d0f109e
--- /dev/null
+++ b/sami/django/mysite2/polls/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class PollsConfig(AppConfig):
+    name = 'polls'
diff --git a/sami/django/mysite2/polls/migrations/0001_initial.py b/sami/django/mysite2/polls/migrations/0001_initial.py
new file mode 100644
index 0000000..3826812
--- /dev/null
+++ b/sami/django/mysite2/polls/migrations/0001_initial.py
@@ -0,0 +1,32 @@
+# Generated by Django 2.2.12 on 2020-07-10 14:30
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Question',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('question_text', models.CharField(max_length=200)),
+                ('pub_date', models.DateTimeField(verbose_name='date published')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Choice',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('choice_text', models.CharField(max_length=200)),
+                ('votes', models.IntegerField(default=0)),
+                ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='polls.Question')),
+            ],
+        ),
+    ]
diff --git a/sami/django/mysite2/polls/migrations/__init__.py b/sami/django/mysite2/polls/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/sami/django/mysite2/polls/models.py b/sami/django/mysite2/polls/models.py
new file mode 100644
index 0000000..a7c5580
--- /dev/null
+++ b/sami/django/mysite2/polls/models.py
@@ -0,0 +1,28 @@
+import datetime
+
+from django.db import models
+from django.utils import timezone
+
+# Create your models here.
+
+
+class Question(models.Model):
+    question_text = models.CharField(max_length=200)
+    pub_date = models.DateTimeField('date published')
+    def __str__(self):
+        return self.question_text
+
+    def was_published_recently(self):
+        now = timezone.now()
+        return now - datetime.timedelta(days=1) <= self.pub_date <= now
+    #def was_published_recently(self):
+        #return self.pub_date >= timezone.now() - datetime.timedelta(days=1)
+    
+
+    
+class Choice(models.Model):
+    question = models.ForeignKey(Question, on_delete=models.CASCADE)
+    choice_text = models.CharField(max_length=200)
+    votes = models.IntegerField(default=0)
+    def __str__(self):
+        return self.choice_text
diff --git a/sami/django/mysite2/polls/templates/detail.html b/sami/django/mysite2/polls/templates/detail.html
new file mode 100644
index 0000000..c225d49
--- /dev/null
+++ b/sami/django/mysite2/polls/templates/detail.html
@@ -0,0 +1,13 @@
+<h1>{{ question.question_text }}</h1>
+
+{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+
+<form action="{% url 'polls:vote' question.id %}" method="post">
+{% csrf_token %}
+{% for choice in question.choice_set.all %}
+    <input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}">
+    <label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
+{% endfor %}
+<input type="submit" value="Vote">
+</form>
+p
diff --git a/sami/django/mysite2/polls/templates/polls/detail.html b/sami/django/mysite2/polls/templates/polls/detail.html
new file mode 100644
index 0000000..3e55544
--- /dev/null
+++ b/sami/django/mysite2/polls/templates/polls/detail.html
@@ -0,0 +1,12 @@
+<h1>{{ question.question_text }}</h1>
+
+{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+
+<form action="{% url 'polls:vote' question.id %}" method="post">
+{% csrf_token %}
+{% for choice in question.choice_set.all %}
+    <input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}">
+    <label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
+{% endfor %}
+<input type="submit" value="Vote">
+</form>
diff --git a/sami/django/mysite2/polls/templates/polls/index.html b/sami/django/mysite2/polls/templates/polls/index.html
new file mode 100644
index 0000000..4560139
--- /dev/null
+++ b/sami/django/mysite2/polls/templates/polls/index.html
@@ -0,0 +1,9 @@
+{% if latest_question_list %}
+    <ul>
+    {% for question in latest_question_list %}
+        <li><a href="{% url 'polls:detail' question.id %}">{{ question.question_text }}</a></li>
+    {% endfor %}
+    </ul>
+{% else %}
+    <p>No polls are available.</p>
+{% endif %}
diff --git a/sami/django/mysite2/polls/templates/polls/results.html b/sami/django/mysite2/polls/templates/polls/results.html
new file mode 100644
index 0000000..3b2c74f
--- /dev/null
+++ b/sami/django/mysite2/polls/templates/polls/results.html
@@ -0,0 +1,9 @@
+<h1>{{ question.question_text }}</h1>
+
+<ul>
+{% for choice in question.choice_set.all %}
+    <li>{{ choice.choice_text }} -- {{ choice.votes }} vote{{ choice.votes|pluralize }}</li>
+{% endfor %}
+</ul>
+
+<a href="{% url 'polls:detail' question.id %}">Vote again?</a>
diff --git a/sami/django/mysite2/polls/tests.py b/sami/django/mysite2/polls/tests.py
new file mode 100644
index 0000000..3604a06
--- /dev/null
+++ b/sami/django/mysite2/polls/tests.py
@@ -0,0 +1,128 @@
+import datetime
+
+from django.test import TestCase
+from django.utils import timezone
+from django.urls import reverse
+
+from .models import Question
+
+
+class QuestionModelTests(TestCase):
+
+    def test_was_published_recently_with_future_question(self):
+        """
+        was_published_recently() returns False for questions whose pub_date
+        is in the future.
+        """
+        time = timezone.now() + datetime.timedelta(days=30)
+        future_question = Question(pub_date=time)
+        self.assertIs(future_question.was_published_recently(), False)
+
+    def test_was_published_recently_with_old_question(self):
+        """
+        was_published_recently() returns False for questions whose pub_date
+        is older than 1 day.
+        """
+        time = timezone.now() - datetime.timedelta(days=1, seconds=1)
+        old_question = Question(pub_date=time)
+        self.assertIs(old_question.was_published_recently(), False)
+
+    def test_was_published_recently_with_recent_question(self):
+        """
+        was_published_recently() returns True for questions whose pub_date
+        is within the last day.
+        """
+        time = timezone.now() - datetime.timedelta(hours=23, minutes=59, seconds=59)
+        recent_question = Question(pub_date=time)
+        self.assertIs(recent_question.was_published_recently(), True)
+
+
+
+def create_question(question_text, days):
+        """
+        Create a question with the given `question_text` and published the
+        given number of `days` offset to now (negative for questions published
+        in the past, positive for questions that have yet to be published).
+        """
+        time = timezone.now() + datetime.timedelta(days=days)
+        return Question.objects.create(question_text=question_text, pub_date=time)
+
+
+class QuestionIndexViewTests(TestCase):
+    def test_no_questions(self):
+        """
+        If no questions exist, an appropriate message is displayed.
+        """
+        response = self.client.get(reverse('polls:index'))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "No polls are available.")
+        self.assertQuerysetEqual(response.context['latest_question_list'], [])
+
+    def test_past_question(self):
+        """
+        Questions with a pub_date in the past are displayed on the
+        index page.
+        """
+        create_question(question_text="Past question.", days=-30)
+        response = self.client.get(reverse('polls:index'))
+        self.assertQuerysetEqual(
+            response.context['latest_question_list'],
+            ['<Question: Past question.>']
+        )
+
+    def test_future_question(self):
+        """
+        Questions with a pub_date in the future aren't displayed on
+        the index page.
+        """
+        create_question(question_text="Future question.", days=30)
+        response = self.client.get(reverse('polls:index'))
+        self.assertContains(response, "No polls are available.")
+        self.assertQuerysetEqual(response.context['latest_question_list'], [])
+
+    def test_future_question_and_past_question(self):
+        """
+        Even if both past and future questions exist, only past questions
+        are displayed.
+        """
+        create_question(question_text="Past question.", days=-30)
+        create_question(question_text="Future question.", days=30)
+        response = self.client.get(reverse('polls:index'))
+        self.assertQuerysetEqual(
+            response.context['latest_question_list'],
+            ['<Question: Past question.>']
+        )
+
+    def test_two_past_questions(self):
+        """
+        The questions index page may display multiple questions.
+        """
+        create_question(question_text="Past question 1.", days=-30)
+        create_question(question_text="Past question 2.", days=-5)
+        response = self.client.get(reverse('polls:index'))
+        self.assertQuerysetEqual(
+            response.context['latest_question_list'],
+            ['<Question: Past question 2.>', '<Question: Past question 1.>']
+        )
+
+
+class QuestionDetailViewTests(TestCase):
+    def test_future_question(self):
+        """
+        The detail view of a question with a pub_date in the future
+        returns a 404 not found.
+        """
+        future_question = create_question(question_text='Future question.', days=5)
+        url = reverse('polls:detail', args=(future_question.id,))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+
+    def test_past_question(self):
+        """
+        The detail view of a question with a pub_date in the past
+        displays the question's text.
+        """
+        past_question = create_question(question_text='Past Question.', days=-5)
+        url = reverse('polls:detail', args=(past_question.id,))
+        response = self.client.get(url)
+        self.assertContains(response, past_question.question_text)
diff --git a/sami/django/mysite2/polls/urls.py b/sami/django/mysite2/polls/urls.py
new file mode 100644
index 0000000..eff2be0
--- /dev/null
+++ b/sami/django/mysite2/polls/urls.py
@@ -0,0 +1,11 @@
+from django.urls import path
+
+from . import views
+
+app_name = 'polls'
+urlpatterns = [
+    path('', views.IndexView.as_view(), name='index'),
+    path('<int:pk>/', views.DetailView.as_view(), name='detail'),
+    path('<int:pk>/results/', views.ResultsView.as_view(), name='results'),
+    path('<int:question_id>/vote/', views.vote, name='vote'),
+]
diff --git a/sami/django/mysite2/polls/views.py b/sami/django/mysite2/polls/views.py
new file mode 100644
index 0000000..68cf7b5
--- /dev/null
+++ b/sami/django/mysite2/polls/views.py
@@ -0,0 +1,74 @@
+from django.http import HttpResponse, HttpResponseRedirect
+#from django.http import Http404
+from django.template import loader
+from django.shortcuts import get_object_or_404, render
+from django.urls import reverse
+from django.views import generic
+from django.utils import timezone
+
+from .models import Choice, Question
+
+
+#def index(request):
+#    latest_question_list = Question.objects.order_by('-pub_date')[:5]
+#    context = {'latest_question_list': latest_question_list}
+#    return render(request, 'polls/index.html', context)
+class IndexView(generic.ListView):
+    template_name = 'polls/index.html'
+    context_object_name = 'latest_question_list'
+
+    def get_queryset(self):
+        """
+        Return the last five published questions (not including those set to be
+        published in the future).
+        """
+        return Question.objects.filter(
+            pub_date__lte=timezone.now()
+        ).order_by('-pub_date')[:5]
+
+        #"""Return the last five published questions."""
+        #return Question.objects.order_by('-pub_date')[:5]
+
+#def detail(request, question_id):
+#    #return HttpResponse("You're looking at question %s." % question_id)
+#    question = get_object_or_404(Question, pk=question_id)
+#    return render(request, 'polls/detail.html', {'question': question})
+class DetailView(generic.DetailView):
+    model = Question
+    template_name = 'polls/detail.html'
+    
+    def get_queryset(self):
+        """
+        Excludes any questions that aren't published yet.
+        """
+        return Question.objects.filter(pub_date__lte=timezone.now())
+
+
+#def results(request, question_id):
+#    #response = "You're looking at the results of question %s."
+#    #return HttpResponse(response % question_id)
+#    question = get_object_or_404(Question, pk=question_id)
+#    return render(request, 'polls/results.html', {'question': question})
+class ResultsView(generic.DetailView):
+    model = Question
+    template_name = 'polls/results.html'
+
+
+def vote(request, question_id):
+    #return HttpResponse("You're voting on question %s." % question_id)
+    question = get_object_or_404(Question, pk=question_id)
+    try:
+        selected_choice = question.choice_set.get(pk=request.POST['choice'])
+    except (KeyError, Choice.DoesNotExist):
+        # Redisplay the question voting form.
+        return render(request, 'polls/detail.html', {
+            'question': question,
+            'error_message': "You didn't select a choice.",
+        })
+    else:
+        selected_choice.votes += 1
+        selected_choice.save()
+        # Always return an HttpResponseRedirect after successfully dealing
+        # with POST data. This prevents data from being posted twice if a
+        # user hits the Back button.
+        return HttpResponseRedirect(reverse('polls:results', args=(question.id,)))
diff --git a/sami/learn-python-the-hard-way/.#quiz2.py b/sami/learn-python-the-hard-way/.#quiz2.py
deleted file mode 120000
index d7a8c4f..0000000
--- a/sami/learn-python-the-hard-way/.#quiz2.py
+++ /dev/null
@@ -1 +0,0 @@
-sami@afro-linux-lenovo-b50-30.18673:1593006374
\ No newline at end of file
diff --git a/sami/learn-python-the-hard-way/quiz.py b/sami/learn-python-the-hard-way/quiz.py
index de9505e..24f27f4 100644
--- a/sami/learn-python-the-hard-way/quiz.py
+++ b/sami/learn-python-the-hard-way/quiz.py
@@ -29,13 +29,14 @@ questions = [
      Question(question_prompts[9], "a"),
 ]
 
-def run_quiz(questions):
+def quiz(questions):
      score = 0
      for question in questions:
           answer = input(question.prompt)
           if answer == question.answer:
                score += 5
                print("Correct! Your score is", score,)
+               
 
           else:
                print("Incorrect!")
@@ -43,11 +44,18 @@ def run_quiz(questions):
                print("You lost 3 points!")
                print ("Score: ", score)
                print ("\n")
- 
                
+          
+# Final stage
+score = 0
+if score >= -30:
+   print("Your total score is:", score, "- You suck!")
+
+elif score == 10 or 15 :
+     print("Your total score is:", score, "- You went ok!")
+
+else: 
+     print("Your total score is:", score, "- You are awesome!")
 
 
-
-           
-
-run_quiz(questions)
+quiz(questions)
diff --git a/sami/learn-python-the-hard-way/ungleich-learning-circle b/sami/learn-python-the-hard-way/ungleich-learning-circle
new file mode 160000
index 0000000..a0012ef
--- /dev/null
+++ b/sami/learn-python-the-hard-way/ungleich-learning-circle
@@ -0,0 +1 @@
+Subproject commit a0012ef6c4d44c875a3173fc746ab0a9259bc531