diff --git a/blogapp/migrations/0002_auto_20170529_2023.py b/blogapp/migrations/0002_auto_20170529_2023.py
new file mode 100644
index 0000000..5181914
--- /dev/null
+++ b/blogapp/migrations/0002_auto_20170529_2023.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-05-29 20:23
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blogapp', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='blogcategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='blogentry',
+            name='published',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='blogcomment',
+            name='user',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='blogentry',
+            name='categories',
+            field=models.ManyToManyField(to='blogapp.blogcategory'),
+        ),
+    ]
diff --git a/db.sqlite3 b/db.sqlite3
new file mode 100644
index 0000000..5ec2145
Binary files /dev/null and b/db.sqlite3 differ
diff --git a/fgfs-screen-001.png b/fgfs-screen-001.png
new file mode 100644
index 0000000..bd41a97
Binary files /dev/null and b/fgfs-screen-001.png differ
diff --git a/imageapp/migrations/0001_initial.py b/imageapp/migrations/0001_initial.py
new file mode 100644
index 0000000..97c7b0c
--- /dev/null
+++ b/imageapp/migrations/0001_initial.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-05-29 20:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BlogImage',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('caption', models.CharField(max_length=300)),
+                ('date', models.DateTimeField()),
+                ('image', models.ImageField(upload_to='')),
+            ],
+        ),
+    ]
diff --git a/imageapp/models.py b/imageapp/models.py
index 4a9b162..8e9620e 100644
--- a/imageapp/models.py
+++ b/imageapp/models.py
@@ -6,7 +6,7 @@ class BlogImage(models.Model):
     title = models.CharField(max_length = 100)
     caption = models.CharField(max_length = 300)
     date = models.DateTimeField()
-    image = models.ImageField()
+    image = models.ImageField(upload_to = 'media/')
 
     def __str__(self):
         return self.title
diff --git a/media/IMG_20170305_125007.jpg b/media/IMG_20170305_125007.jpg
new file mode 100644
index 0000000..0008673
Binary files /dev/null and b/media/IMG_20170305_125007.jpg differ
diff --git a/polysite/settings.py b/polysite/settings.py
index 0e88407..952cde0 100644
--- a/polysite/settings.py
+++ b/polysite/settings.py
@@ -59,8 +59,8 @@ TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-            '/home/ottona/Projekte/polysite/templates',
-            '/home/ottona/Projekte/polysite/blogapp/templates/blogapp',
+            os.path.join(BASE_DIR, 'templates'),
+            os.path.join(BASE_DIR, 'blogapp/templates/blogapp'),
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -82,12 +82,8 @@ WSGI_APPLICATION = 'polysite.wsgi.application'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'djangotest',
-        'USER': 'pguser',
-        'PASSWORD': '',
-        'HOST': '127.0.0.1',
-        'PORT': '5432',
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
 
@@ -129,7 +125,4 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
 STATIC_URL = '/static/'
-STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, "static"),
-    '/home/ottona/Projekte/polysite/static',
-]
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
diff --git a/polysite/urls.py b/polysite/urls.py
index b804cdc..b11d346 100644
--- a/polysite/urls.py
+++ b/polysite/urls.py
@@ -17,8 +17,10 @@ from django.conf.urls import url, include
 from django.contrib import admin
 from pageapp.views import aboutpage, contactpage
 from blogapp.views import listall
+from . import views
 
 urlpatterns = [
+    url(r'^$', views.redi),
     url(r'^blog/', include('blogapp.urls')),
     url(r'^admin/', admin.site.urls),
     url(r'^about/', aboutpage, name='about'),
diff --git a/polysite/views.py b/polysite/views.py
new file mode 100644
index 0000000..072f5f7
--- /dev/null
+++ b/polysite/views.py
@@ -0,0 +1,5 @@
+from django.shortcuts import redirect
+
+def redi(request):
+    return redirect('/blog/')
+
diff --git a/templates/base.html b/templates/base.html
index c03b5a7..a861f1f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
   <head>
-    {% load staticfiles %}
+    {% load static %}
     <link rel="stylesheet" type="text/css"  href="{% static "general.css" %}" />
     {% block head %}{% endblock %}
     <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"/>