From cb3901bcdb13dde9733b4f328d2f45d686c772b0 Mon Sep 17 00:00:00 2001
From: michigg <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Mon, 2 Oct 2017 23:09:13 +0200
Subject: [PATCH] migrate conflic fix

---
 .../apps/events/migrations/0001_initial.py    |   5 +-
 ofu_app/apps/food/migrations/0001_initial.py  |  34 +++++++------
 ofu_app/apps/food/migrations/0001_initial.pyc | Bin 1840 -> 0 bytes
 .../migrations/0002_auto_20170929_1611.py     |  41 ----------------
 .../migrations/0002_auto_20170929_1611.pyc    | Bin 1101 -> 0 bytes
 .../migrations/0003_auto_20170929_1614.py     |  45 ------------------
 .../migrations/0003_auto_20170929_1614.pyc    | Bin 1282 -> 0 bytes
 .../migrations/0004_auto_20170929_1907.py     |  39 ---------------
 .../migrations/0004_auto_20170929_1907.pyc    | Bin 1479 -> 0 bytes
 .../migrations/0005_auto_20170929_1909.py     |  25 ----------
 .../migrations/0005_auto_20170929_1909.pyc    | Bin 1015 -> 0 bytes
 .../__pycache__/0001_initial.cpython-35.pyc   | Bin 1593 -> 1449 bytes
 .../0002_auto_20170929_1611.cpython-35.pyc    | Bin 912 -> 0 bytes
 .../0003_auto_20170929_1614.cpython-35.pyc    | Bin 1072 -> 0 bytes
 .../0004_auto_20170929_1907.cpython-35.pyc    | Bin 1213 -> 0 bytes
 .../0005_auto_20170929_1909.cpython-35.pyc    | Bin 829 -> 0 bytes
 ofu_app/apps/food/models.py                   |  16 +++----
 17 files changed, 32 insertions(+), 173 deletions(-)
 delete mode 100644 ofu_app/apps/food/migrations/0001_initial.pyc
 delete mode 100644 ofu_app/apps/food/migrations/0002_auto_20170929_1611.py
 delete mode 100644 ofu_app/apps/food/migrations/0002_auto_20170929_1611.pyc
 delete mode 100644 ofu_app/apps/food/migrations/0003_auto_20170929_1614.py
 delete mode 100644 ofu_app/apps/food/migrations/0003_auto_20170929_1614.pyc
 delete mode 100644 ofu_app/apps/food/migrations/0004_auto_20170929_1907.py
 delete mode 100644 ofu_app/apps/food/migrations/0004_auto_20170929_1907.pyc
 delete mode 100644 ofu_app/apps/food/migrations/0005_auto_20170929_1909.py
 delete mode 100644 ofu_app/apps/food/migrations/0005_auto_20170929_1909.pyc
 delete mode 100644 ofu_app/apps/food/migrations/__pycache__/0002_auto_20170929_1611.cpython-35.pyc
 delete mode 100644 ofu_app/apps/food/migrations/__pycache__/0003_auto_20170929_1614.cpython-35.pyc
 delete mode 100644 ofu_app/apps/food/migrations/__pycache__/0004_auto_20170929_1907.cpython-35.pyc
 delete mode 100644 ofu_app/apps/food/migrations/__pycache__/0005_auto_20170929_1909.cpython-35.pyc

diff --git a/ofu_app/apps/events/migrations/0001_initial.py b/ofu_app/apps/events/migrations/0001_initial.py
index 71c41f4..6c1b9bd 100644
--- a/ofu_app/apps/events/migrations/0001_initial.py
+++ b/ofu_app/apps/events/migrations/0001_initial.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-10-02 20:56
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -7,6 +8,8 @@ import django.utils.timezone
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
     ]
 
@@ -14,7 +17,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Event',
             fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
                 ('title', models.CharField(max_length=60)),
                 ('category', models.CharField(max_length=60)),
                 ('link', models.CharField(max_length=60)),
diff --git a/ofu_app/apps/food/migrations/0001_initial.py b/ofu_app/apps/food/migrations/0001_initial.py
index 18a3ab4..5b5cfeb 100644
--- a/ofu_app/apps/food/migrations/0001_initial.py
+++ b/ofu_app/apps/food/migrations/0001_initial.py
@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-29 15:05
+# Generated by Django 1.11.2 on 2017-10-02 20:56
 from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.utils.timezone
-import uuid
 
 
 class Migration(migrations.Migration):
@@ -18,33 +17,40 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='HappyHour',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('uuid', models.UUIDField(default=uuid.UUID('69752d6c-688a-4fa4-ade8-8dba8f6f45e7'), unique=True)),
-                ('date', models.DateField(default=django.utils.timezone.now, unique=True)),
-                ('location', models.CharField(max_length=60, unique=True)),
-                ('description', models.CharField(max_length=60, unique=True)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('date', models.DateField(default=django.utils.timezone.now)),
+                ('starttime', models.DateField(default=django.utils.timezone.now)),
+                ('endtime', models.DateField(default=django.utils.timezone.now)),
+                ('location', models.CharField(max_length=60)),
+                ('description', models.CharField(max_length=60)),
             ],
         ),
         migrations.CreateModel(
             name='Menu',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('uuid', models.UUIDField(default=uuid.UUID('9cee3b25-b9ef-4202-bb6d-2ae40d67d8ce'), unique=True)),
-                ('date', models.DateField(default=django.utils.timezone.now, unique=True)),
-                ('location', models.CharField(max_length=60, unique=True)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('date', models.DateField(default=django.utils.timezone.now)),
+                ('location', models.CharField(max_length=60)),
             ],
         ),
         migrations.CreateModel(
             name='SingleFood',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('uuid', models.UUIDField(default=uuid.UUID('6086ff0b-2216-439b-a7f7-e6360aa12df7'), unique=True)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=60, unique=True)),
             ],
         ),
         migrations.AddField(
             model_name='menu',
             name='menu',
-            field=models.ManyToManyField(to='apps.food.SingleFood'),
+            field=models.ManyToManyField(to='food.SingleFood'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='happyhour',
+            unique_together=set([('date', 'location')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='menu',
+            unique_together=set([('date', 'location')]),
         ),
     ]
diff --git a/ofu_app/apps/food/migrations/0001_initial.pyc b/ofu_app/apps/food/migrations/0001_initial.pyc
deleted file mode 100644
index 81b9403c1c090dbf1571cd44b9653fc5be28cef9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1840
zcmcIkUvJw+45uvHaT2FV*Ct!ny$mQ&V}NYOabyQ5hII|H<{`u2q!0BTgtLxv<m!(n
z-EDJUvk$oMvJbG4R8k`t`qa%bcsw5e{74?p{cC3nzWMWQ2)93%*6*MO<<G=u`a6&S
zqz+6SaCl#Xqz0)AQy0=YOzV}@g`@$~rdSZa0n-i8bwC#uEr=Y@4fq4#2H@?q1=@wn
zPLuq{f77qy5NGy?*eninjX@F{EL2i<YJ9RqB#q~VGI5@jhV4?)O3EM2Ch-?{M;}sP
zSKo6A`(%&6$g#$F=fo4H1}rL|1gpkiaD!1YT-r8-HUT$5Qw}WxU5`k<DQa7ww*a?c
z(FVN@H{_ws`ZrKxogLBH5uFFH*oDO&EFRw1c_2EUf!+nZcmL?&M~~(W4zWf~=AVN6
z(SMA5UcV3T@u$Jt{};T2k5|UM3;hW6=b*okD@gQ-m=KaLK|duO=LTHDIo*fJW#=op
zBBo9xQz=@$Mz7U!xq6-3LM~VoW1>sT_b=9_O^dQ755fYKL2b54uq@(K6|3MKuH+t;
zSi~xc-=nDiip4B1F%bXk=KR!hJZs6{1~D2VWfNnc5$~UjjtANgJ%2n_-Y`-_PiY)`
zV?9&j$d87{I1*SiAir1?N1A}x78xgbD3ejmiTXWAFq@m}_ytE}pc>1th?hJ)VtIj?
zm9Qrv;?Zny?9EOv@`i){z?;o{?F|$T``RDrafp_u?=sHj37+M-uHg2^eiZd*-e7R(
zd&8rXnWsk4$V30g?<;jU(9uXDaq<-`p4X}tT!fSmm<BOYW+PLc+s7oJCY0TX0(I9h
zI|p=NIMqO01cCSr0(u2(g0y9ySA|6>Y@Ef08X;ZKxWr6j7RFdk<eA}uypk?nFs6yb
z=KjB={+@By1=tzAJ}7N{^XB}tl7DC)Gc1<#Q|d!?&JUAbsBE5#3v1$}6xb$C@qM15
z;kPx*e-pb`*Q%)OIJ1{pSDRhhT&Qeyl{2km+=6^bFQPnv9ooT~lt0n7cb%u$OXKi5
zp3i%y`8!J`HrV^&{Hm8n)}ylW8t}>`?s17p|L#%k_51z9;I?wz<!Zu6Ic(V{(yY-}
z-*lR_=gu?wo;qK<>)o0c&S^RwuIFu!B5Q0xJ(`dRB=M?5T|JYAR1Mgt!&|wOt$SCp
k2@mSz2@{62PFuMDC3k7ri|THD%R$Q)k-gf1({|eKKZgm7J^%m!

diff --git a/ofu_app/apps/food/migrations/0002_auto_20170929_1611.py b/ofu_app/apps/food/migrations/0002_auto_20170929_1611.py
deleted file mode 100644
index 2a1f658..0000000
--- a/ofu_app/apps/food/migrations/0002_auto_20170929_1611.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='happyhour',
-            name='uuid',
-        ),
-        migrations.RemoveField(
-            model_name='menu',
-            name='uuid',
-        ),
-        migrations.RemoveField(
-            model_name='singlefood',
-            name='uuid',
-        ),
-        migrations.AlterField(
-            model_name='happyhour',
-            name='id',
-            field=models.AutoField(serialize=False, primary_key=True),
-        ),
-        migrations.AlterField(
-            model_name='menu',
-            name='id',
-            field=models.AutoField(serialize=False, primary_key=True),
-        ),
-        migrations.AlterField(
-            model_name='singlefood',
-            name='id',
-            field=models.AutoField(serialize=False, primary_key=True),
-        ),
-    ]
diff --git a/ofu_app/apps/food/migrations/0002_auto_20170929_1611.pyc b/ofu_app/apps/food/migrations/0002_auto_20170929_1611.pyc
deleted file mode 100644
index ab8e8ce2605b1be81173cbf37101ae8eb9327789..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1101
zcmcIj&2G~`5FY=;t<zTO3GoO%K%L|Os)P^)RKx)eZZ8domB~(=O>M8`-9-x5@FKhr
zZ@^RV05G#|Qz3rD1<Rh99na2w^UZAZ?P&bD`*O8_n<pau3_>t3$dL2~Py;jp%mWB`
z9YP&K6Tv)!CWd)T-Uu*)^$3;$$QV8WYyqz3BakDw$P&t<zSENhWZ7d9u2l;yQPj#}
zU)ClI`Ola{qpH5NO1H-HzJ{V|V^cEU-2T}i<xI~R=~prk7@$0aijamLPs~^e8$lu<
zTL>BC;7oq!-22%{@ORtyL8gEStSM#;NXrAjlyhz&8fxd@A?-f~56AsAxJqC?hT<YS
zq6%G1VyU%shh$79lc`XxvZ|~H=9ntcmJK?lYgKmLW~E(kd7F2$;hd5_QG=~>%(zi)
zRin?#T~N}FNG%oC((`Vxrz6xyv<KwxdexNuMqJ~@H|@`$G7h)<B!ovLgoh~v_0-i!
zOD;oVhpohRq0kh5K6qP!jsAe=9s^@Mt7%UBvhb6_1)e#phX}@dPE&-w)XUzXKS_5q
zTYi)>3V=Id-qA8&=?3#gEmo?k@|XJB5hE7!SFbN~y>t(WKGuRYeI{pyDE@Xlb85g$
zlmtS|Cez20)7hz*KAKKXx=q1XXpcVgfJ73daT+8+68<8C`-5+%-}=jP!_(4P*Aq_#
qB>~?Gxh~sEpUC%~DNltz>#j6!{qOpGQ=bfNe9HYWJXy!#z32yHQ|!+G

diff --git a/ofu_app/apps/food/migrations/0003_auto_20170929_1614.py b/ofu_app/apps/food/migrations/0003_auto_20170929_1614.py
deleted file mode 100644
index 3d0b9ce..0000000
--- a/ofu_app/apps/food/migrations/0003_auto_20170929_1614.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0002_auto_20170929_1611'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='happyhour',
-            name='date',
-            field=models.DateField(default=django.utils.timezone.now),
-        ),
-        migrations.AlterField(
-            model_name='happyhour',
-            name='description',
-            field=models.CharField(max_length=60),
-        ),
-        migrations.AlterField(
-            model_name='happyhour',
-            name='location',
-            field=models.CharField(max_length=60),
-        ),
-        migrations.AlterField(
-            model_name='menu',
-            name='date',
-            field=models.DateField(default=django.utils.timezone.now),
-        ),
-        migrations.AlterField(
-            model_name='menu',
-            name='location',
-            field=models.CharField(max_length=60),
-        ),
-        migrations.AlterField(
-            model_name='singlefood',
-            name='name',
-            field=models.CharField(max_length=60),
-        ),
-    ]
diff --git a/ofu_app/apps/food/migrations/0003_auto_20170929_1614.pyc b/ofu_app/apps/food/migrations/0003_auto_20170929_1614.pyc
deleted file mode 100644
index 1e1d2ba35ac3f91b3c7d66cf5d02ed50ebdc6db2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1282
zcmcIk&2G~`5FXq4Z&E4{aNq@eAx=UCs#GC<Dt-=tlyYe}SSGu%*Q~uJ-W8N<c|Kl-
z2Y{JzLQ$crIN&6^voqtFZ@!sL@O?CR@$uWq5;jkO`y=q7euIL*uLl~S@L=JAM`s_j
z4@Cfr0E!kYT8%aU-G)U6L<?j9c^6h5h&Fr$I0HCYbU_4g9Ck3K`hidAp=9@Paiv-s
zA!DtqTqn8?eX<O2DO9>ntTJV7>AeEIbp6`)QGT^G{er!V+9w4221b@ZXvH;15w_2O
zS_B+1AU=d8Iw0GSBit^?F62GP`;ZS1t9J$g74W-%Z|lDUq7ULSH?%fkFLN9IWA?`X
z%CI92yZiU-X$KZVm>-ACbqiTq86(_n6eg3&EKZy?@oX}EFgchV#MArJX~R8{9hXTV
z9r2wdRdt#fx3(04)g*|-O4~+ZrKA?NODefaoVIR<<$AeR6}7MlntYD6EK{4QLo~Y{
zF4`=)$ByC^vUHAGU#l|Jl96r`@?5ajRRx42j9@8v%oW5jXOCl?Ag3iBhiDVBlBJO4
zQptMG(@2RQYn;MoRLz{{kcvOTDp|#2DDtFC4Oi`~(lsZts*qnyDJ|We(tP3}eVQdr
zC{AxG9B-cH5Pjf$so&u-%1j}nLM=0urqPl4;E)R|qvtQ*MrP&iBLB3<wBxUihy?WC
z-jE2JdGF6=?vJa}Ibk9;>KQJbpx^3y9sJz!oBjHQ{h~gkcQ*{KoONqtaE>bAA{#o!
v;yrWNkaiP|8$DAr-qJItTgrIO%V+6-bHGhHZ2JF@8e7vp%ASAA8wNiC)I|~S

diff --git a/ofu_app/apps/food/migrations/0004_auto_20170929_1907.py b/ofu_app/apps/food/migrations/0004_auto_20170929_1907.py
deleted file mode 100644
index 53039bd..0000000
--- a/ofu_app/apps/food/migrations/0004_auto_20170929_1907.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import datetime
-from django.utils.timezone import utc
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0003_auto_20170929_1614'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='happyhour',
-            name='endtime',
-            field=models.DateField(default=datetime.datetime(2017, 9, 29, 19, 7, 24, 668322, tzinfo=utc)),
-        ),
-        migrations.AddField(
-            model_name='happyhour',
-            name='starttime',
-            field=models.DateField(default=datetime.datetime(2017, 9, 29, 19, 7, 24, 668291, tzinfo=utc)),
-        ),
-        migrations.AlterField(
-            model_name='singlefood',
-            name='name',
-            field=models.CharField(unique=True, max_length=60),
-        ),
-        migrations.AlterUniqueTogether(
-            name='happyhour',
-            unique_together=set([('date', 'location')]),
-        ),
-        migrations.AlterUniqueTogether(
-            name='menu',
-            unique_together=set([('date', 'location')]),
-        ),
-    ]
diff --git a/ofu_app/apps/food/migrations/0004_auto_20170929_1907.pyc b/ofu_app/apps/food/migrations/0004_auto_20170929_1907.pyc
deleted file mode 100644
index 150eb3c1cab225ed59c7fac8970e389fff5a27ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1479
zcmcIkOK;Oa5FXok(?@9OLqIvATximVs47*6LIvUghqN3T4wlKToegVmh<7F0Yxomf
z`9b^#?%enRFf&dFFQHy=?AhI!-I;H`nN9F@vGL`@r}I8cp8&^);6onbMBwXz21q^V
zdEn972kk=|Kreu_1iezB4M3NnSLPEX&=p9l(5s@Y3^IUW4Pp;O1>OTp0M2_g5CNRF
zsu)9k!>8rp%r;TDO!bYBp;lIoBb~Q=vNTYnDj7#snJl*zTH-F9zbH-;YG?blj^p#$
zz8^WQqV^Hx)Wk3nC>3!F63oeGbS26P0STO73KfuL7*;@3K~`Z{1%YtuAQ~X9fmi^s
z2x1AuGRPWCs@??f4JgZ>{WP!U=lb9LU@XM5!gy9^elYqCkO*K6#5%I*PlF;JjEmqm
zKq9c)l-C4b@Cj03y*aaP&8-R6YYDoitvkeB2}Nv-a2q)3bUJ%s<g5vIJ39xR!`;Jh
z=l;%qQ3aws%%W5}B6|>xMi&F)#+E#=nu;njVO1(^8RxN*T3FHw8AncA^%)n6POB{v
zR362xut~FzyA9w9+e?+jhQs7G8e8(HCTMlk4!Oz_EgADHG@rr-dh29?HF_6nnI(3h
zj_`zCMp2kUYZ7S(a?FW~$Vyj3qc(l+FxI9rbKHGbB4@ty4{!f65hP2YL*_IL8F(0C
zcRMX{xqvnyM@Xp5`by?qzA1F#ScoS?ZI^Ed(RqS-u!=nr4x+3}mxJ9NYrIp%2HO63
z5KUJ^;Mo{iqf+p$m(1eXlqE|pa%tI%8R5m`d)PuP%tihRm+gT`Wjj^<fl8A0iFxCY
zM=RS;pPjW$?CxQ|&=}H)U*4t);{Ms)Ze#Q9|K5CuorCSsMVDX_@cb@{N>DG=y$b&J
z{9ngSUN5t3(f%o?v9oTBoOV$K{8u4{QI?o(@tRp>BD*VOTthK6I;(WPO+;RrtRRzt
d%=6~i|4yDudQ`N<1FCplL(%lty#=osd<SP9LHPgx

diff --git a/ofu_app/apps/food/migrations/0005_auto_20170929_1909.py b/ofu_app/apps/food/migrations/0005_auto_20170929_1909.py
deleted file mode 100644
index 432b26d..0000000
--- a/ofu_app/apps/food/migrations/0005_auto_20170929_1909.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0004_auto_20170929_1907'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='happyhour',
-            name='endtime',
-            field=models.DateField(default=django.utils.timezone.now),
-        ),
-        migrations.AlterField(
-            model_name='happyhour',
-            name='starttime',
-            field=models.DateField(default=django.utils.timezone.now),
-        ),
-    ]
diff --git a/ofu_app/apps/food/migrations/0005_auto_20170929_1909.pyc b/ofu_app/apps/food/migrations/0005_auto_20170929_1909.pyc
deleted file mode 100644
index 6f27dabb0072cc5d4eb2168eacbfc73556893a16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1015
zcmcIj&2H2%5T5+(PnK4ykbna(kPDl%0#z#^1gHXWphzi~hJzK>PS(MRSFx?CT+37N
zP`nHe05i@mMdAP#lI(aqGq%6)8*lXeaB=?i+vOT|PlV%h2*JEVhvOH30_XxL0|;my
zf(oIFpp2l4p^V391Zo216nG3Gf_4UV0DJ;p0B!&-%Ng(pF48IPDSzOT2I$!%G_IFx
z%>`4^ilI^_4Jorg)5&J2tkk`+w64P{WzKDa{@Z=(7i?Pal3-t<BY@EI1R8`LdO$G&
zM+}G$Veu)53A6}z24V*79NGlh1!4_uAR+?4*U$e_--J-!f#M=15H3bjYt7vQbn-lZ
z%qnL!JIRkv^VP|U9k24!kslFaebos^oHo^Vd%e+au(X2@&(IM)x3Uv<f_^Q9;+CRZ
z)Rj}#FEq9qEY*1F{^|Vm0QazSG|U5F%p+n9MRrQylnS`m;_0GaOJNG%Fe3OuVWVCV
zlESx&u%A^{_>k`uZ>zr19<j4h8GjG~{H%Ln>4Nq8${(n=*mK|F6r*r!%m<ui8{LVl
zlk1Ian(Rz}a-Ha{$X>sBpXu5?LcwTcG~&->Bs<pcuT6&PKlxMr)pC1X5DMaN?xLAS
zNt^^zd>@A6m{M-1N$so~P?G{f;IH3EaLGS<RYn=^VR9Guq?dcb#UW<=dAIbu_rE!M
U*`JObeMYS^^fx*R?*|9bPexJYf&c&j

diff --git a/ofu_app/apps/food/migrations/__pycache__/0001_initial.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0001_initial.cpython-35.pyc
index 7c86fc7a31af3ad6c73ec4faa1ba899358845e11..8674b14bacc9f24683cb7904587c6b6e08b7e5e3 100644
GIT binary patch
literal 1449
zcmbtUOK;Oa5FS6`#Ced=Cs3$_#3cvfazzzt)v7Irlu9iJa<NQy<7{es)Ad@AUdw+$
z{2h*a<$(GZxWMeXQK(dv1GaZOo|&Eb=JVL=tycZ_*Y6)rssKOWufs)s2Uq?M1;NXL
z1R%9wV1cEdZAffL9T+%}x-f7{s{=^|1|A#|7f1!ZU|<EP1CuITVQdwM1E*c@8k0iT
zQk^1WLr!RzFiAy}<Xv0UQx=OzGM?qiOVOF+$3q=IKU%2l;L3km02DML1T?TUMnn^%
z?gFjA#M3CTV2OoRVNwHvMvO-wHMjzMgaJNimk*>4v<{O7Oqwuhq1V#h#=YL=z227b
zJ^+GOd!Dd!hcWgvm<8sC|A+amy0LS+#L~Y?*tc+!WzAd3SZvQzwSlYvSv5SPTr*ob
zK-Pgg!Wioc9NiSQgG@dK@&qW>eF`zAGT9bh++KR0Exbs}0PAkx$ZRUVKc9;;<z`Vz
zm46gXr?Vqo2<43!O-Qb6MpR=eSQ?30cur@^&#7Qh!Y=87a!DkqsuDViibSGIMnX!4
znW{7+MyVxyXl4(`F!~%OG>hf<dK;%rH3-dzf=%^gDz{IwLe)=M7AN$8bD}&P<%@#i
zK0UIb0qCYWs$#GyTk^~H2t#{|T?2otTNvvW+GT=J@|emo6~|p$G_kPgptz;4s9I<W
zgrTa3Ar>qWih45)FN!G9rSYlCGA6Ng)g*L^{n2d5Xf7Pn%buXfMPEY|uD1BQh2#gC
zMCI?Jt5iKQiL#ihN+DU2tD5HMl4n#o8ULjGy>TSUz}hY$rPl68+3bvKSsIpi6a2Q{
z8+OiadQ(nLrK<BOe)Q%`{|2I`d)4CCNigOq4N^87vp5d+`FVjvN*Wx#Jq!4#c!`|p
zd#LZY@<7vy@$>&iu(h@ID!l2xH=T(JruA{<uTeB@&-Ps3^6U+3)10f;hBJSjYtOX>
z&m~*m+eVr^-I^wSRLDXg&BDfv$}f59k&lMolG4>1qv5VMr%t@U4JOf|<5CNBrrLJ-
RI^XE`lzS*T_L|jn{s3FZWhVdt

literal 1593
zcmb_c&2HO95FY-B5@k77T02Rbra=J%feKKPWtozJphytIi4P76#5q(w5G(FbrotbE
zKW(I|@-lsfzC_P^?J2L2Q)ibERHMi#rL@D@*>85f{dT!`cXylc<6po0SqJzV{`HvT
zKcSZYN`}*4g9sqjV4{I0`#MBA#0E?Zh)tN7Rn&l}1`|tVkY9&M9iDR&cn#iDQVr06
zc>~sz*8pz7tB&=73P48_?J^1dl%p4g1!gSDJGyAb;VffCm?pWfVj7I{m%hYro;Ep8
zsO1lI00ha7$W3&~mzd4SHvwxfCrT7FpyGmc$%0dm@O5RWYXffr-+?ul0fAc}VHDg2
zY{Gm8_$^oyeox}ppi4|!VOk2a3-enr--CJkCg!%n+y?#?@UL$U?SFP?R+A;R%n!bd
z`JMln`OLgY@9vk;yZ0Y@`sbA~Hl<0=Z-9TRc9!gYl|l-C2mAqHv^5ySbFvTodpc+j
zg?+g>O;^H9Sd7Ac!4`|<i?qyy6@(b^T<9SeEmjt(=V!<Y<YH%$g)z&P-WyyBJI5?!
zQMkf$(fSRuX_}*_=F%_Dgjtr9UgsFFGAdSw?&;`cz+K;Q$7ALU12%LR$FVc!Q#KCV
zV0eNfVbQ^VTcR*Il@pC9_0@@|!_VG%5hk<Z`om*7<6?(n?q}gbeh<RD#H3sup8AN#
z)4_=|J;lHo4*COUI(4}-U^wh^cf`j&isq{@nMHV>rkptS$8Hexr_Nw-<T}IS)2YKo
z!N@`P*zGfRG~mIAYRiwUT9_GAB~erQ2)#&G`y^W44QRIRcH)<v1JUqQhUbZ<=g|yh
zgygq8?`_E<DH8SSVG<UkplESiV8Su+L(DTnE%2F={8HA=Oc}AC(oUSqoe}oy*B58X
z&GzJwDf_}cBhe~=#pf)UrJ`0AVU&wT5yrSm6BI_0{x0li*DR}mji;Pf-rglkmRG5?
zRiK$J=<ZP$&L5EVsE#rpf9_qUG4|rnzYb@!-dXylBvlIRJ-@i>r9tVCB=YUax0I(R
z<stm$`s(%j{Uh(w+PjNoR-?I_)bc)=mTu{mX=|4LNIRt8eeDNh+uQoe(=1J8cWfzh
zP!?rI!e(><l3tYtT|QNcRw5pJ3MyT?8(FePl%S+kvuzh!d6JfBJg#=}C%HX&gG^h$
JqqVe_@egn9gUJ8@

diff --git a/ofu_app/apps/food/migrations/__pycache__/0002_auto_20170929_1611.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0002_auto_20170929_1611.cpython-35.pyc
deleted file mode 100644
index d8f79353d48201b5e3f0805463f45bcf3033bc8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcma)4!H&}~5S=7$+N3R%3m`afjs%;wheazPv@6iAIIsuU3*}&i+D*M1$H9q_%C-Cm
zM}CG6@D*|37dSCaD7%1!h~lw5^E_|n*|)~y_+$0?)jb061+IL!heI6o6EqBe4+;S3
z!NLR2?R_YGkO3?LkOUS4yb~4xBk%!(1b6`FJ=kKr2doD#lkgiRg2b~EQ;MZxoED<t
zIxFhLx3Ltt&KjZ0+J+K?MZI+J-8aF-A&&Yh8V;@qtYP5;n?Q~=1;B~p>ncD#7Qz<%
zOK0B|@uzd}yED9UJOUO2@54D_hQLO^#=x$*oLdN7+78^M{ZDX5_fK#h!U6%;QLh^|
zdcG6Il9f`-j;7P;jEYh;A}dfcrxPtR$!)aGs%o=VMqAQ4h%tg$B6(?ST#GU<c$>mU
zZ*L`d!E97>jd{d-er$)87BbTtdcikmr-`pa)LHk@B(WXPmV{CpQ;MXf;J6-9`qpHH
zV{<#kD_$~QE(Nc3fCugH1()g_KW@q5qXI9xU2Ec^(UED?&zP$49kiGK3G^Mu?9BJq
z=~_viO0isvJWrph3xoYMJUw}Kma3I`fIYjJx*12Ex)u??drB$lHK!R8(fM@taC$I5
zptJqiY_Hnr9x}N8>icL$K|~@i^g{nH>)q~rzvlMjX%adyR;Do;+t)rOu@O7Z%3STS
fH?06|pDp^br*3uEp$CsTDIdGDwbNwc-wb{LDmc~s

diff --git a/ofu_app/apps/food/migrations/__pycache__/0003_auto_20170929_1614.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0003_auto_20170929_1614.cpython-35.pyc
deleted file mode 100644
index 68d7c08bf1d3fc496249dc004be5c7c5f9b654a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1072
zcmb7C%Wl&^6uo}Nc9Rm2ph8{1)(he!AW)?W6;V-GP!_PkEJnsNu^q;qbZiUCHv9}f
z!v~DSidBDs6?beRP@qECp4au6bI+VRd!teC^z6&)uQtFp`0c?p9AT?pU`O#YfCH2U
z#0D68Z2~u;v>>*iv>~?ps0G}C*o6~n19jjN0v%u$EC;Yg>;R|*FGKeNNg*`UxUGs*
zP)2ysFq!Z=G*wU*nM|5ORJC$T{K@OnRO2_#E>4cH)%ykj1FZ-J#U{`(WGK)AX2a6a
zsd^RE1v&ucY8BK2=E2g3WdO?^Sc9<!Ya8!x@I#;h(92->x2L@fHqxj6kL*4EpR~Ij
zEi(Ttd*(unJXg@>tIB`A@lx3fA*kA$PN#E{w2dJ1>FmMuV17Vm_h&P7T{}&xq-3$5
zC#%(YE?TK<9Z)t+8m62@!8la|$`(n>8?{4OoyuaRONINB4}`NSYx0XjEROQHNV_U3
zyJS_Xg1V?O&a{ft(3CD><N&*HS9zq%ONa^xK^-k;I3E&n)+SsF&@0MTtfH(+3sy@@
zX9yl~yfja=C~50}e~dD_wQ}h)sWPFQwkde6yrwAGM^Q0lRpPz!ALmKGQ3Ya!7q7c*
zpF!Tzs&x1LO_Yn0MP-rZMV3X!;$4f!XjpXe>{TQd?H#m8k3^5y>PVjq@teCFq0@K&
zbo$<8buJyu;9;xh*bOb;_6--`eX}30ZH?RUZhz=$w-#;FO7usX$fW%K)D!x)bEtRa
n`p;nJ#AIWHyonn+qF;yZXSX$zci7kAq2{f1vBu^NV`%*V8jb!h

diff --git a/ofu_app/apps/food/migrations/__pycache__/0004_auto_20170929_1907.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0004_auto_20170929_1907.cpython-35.pyc
deleted file mode 100644
index d1dcbc633a49d65f11c12916214b69292bb68d10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1213
zcma)5OK;Oa5FS6`7byvpwvk#M2ZR(5b@~uhr3$s8qT)a=lmp?gGTDveu(nfsEzw@X
zjbFf(8-Io$us6gh62E{Gv+G8MiUZE>>^yd6zM0vqEGz^+KYx4k$p-iVe|#vzKJJnr
zp|}j-0I30e0}Lgbz)eUk=v$E5(6?)?1-t?MhW4<5JCM52cfmNKsB_>WIy%5C7<({9
zUk|7Sue$CGlR(#y?J7$KIc0<=f)x=jyQU1%BrYP6<XI`56pg$*#;aB(1_R|b{}z$i
z$6a;|00s&u;_RD1Z$pf@Enqf`5rzfSh8hobfjKaCfqK9^g^Kz>1EAM{Hi0exy$-Ym
zv<=LMscTFDmvuGH4fwA(H~$p}b0MBZjR&#Scrg1dpi4lPfv&(5%!{N53GX2I4lu-a
zN7XgO1*U>jTUY1SyO-7&XM%;SVXN;+|K+@&(jMkHl`FkoZ;M2g$jN4JW2d*fxl1;l
zY;0raRkukNrA+#xXfin)<y9eVt#DaJMS_;bFkzfZm$G40agls?0cJi9Vs={*HI^Bw
zVAesBeAx^@I^sOZhPm`h5fws3Nv294lt~tIrcpWg6izF4f+(U7gtIIbquCyYkgeK6
zL>@CSVhD&vf=Q3(1N}^-owBSt?wW;4TX;y2Use3tRlX%Xq6;KM283Y26=%pd2|2AI
zt}0a$WfLryWrKv3g@r++cR=ZLRd``5(LY28T9%$dqiQM|$`TxKe9E=Se>RFP*hQ^=
zUDr4-#44GPK|aB!uiyJuC>~-AO@6%%M|sM^G#QMNI1Uf<_Z8MDSa|f}B+Q4^V;qn=
zi8^tYq3R>vpZ|M8ob&e8Iq&v%)+c9$gK5;v$_GfAmT&upgTF2F@3W)jmZsXL>#Md6
zD^V5LsKP{V>C<tP#rZmYr(2~PRNPmVr3*_X5?-#W9-Ze|-6tLGvf7$^q@29HdMZy<
P@KQ~)Z7v&4qiy{LJ?JPN

diff --git a/ofu_app/apps/food/migrations/__pycache__/0005_auto_20170929_1909.cpython-35.pyc b/ofu_app/apps/food/migrations/__pycache__/0005_auto_20170929_1909.cpython-35.pyc
deleted file mode 100644
index 033e67eb56dc5e6a3fcf0c3361dacbe3d1353832..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 829
zcmah{&2H2%5T3;O?^ddiN+tRPIj~79P_+_5MXIPcupHn*I9Orr%_cbU;y9|xg~Rd`
zya6x61Nh2`SK!1rVFiK%NoH)%jK7(0CMSo7$@25p*EcS}H~8c6aDR!?zd*(Cb3g#J
z4ipYJ_UwXip(RidXgw&r$x1-@Py}$zJYYV2!ayH5fhL3<#)iNMyi9}d2nwlVj)tyY
zNye$DHCLtRQ`aPIU8z#nvg=LIqEqzCm5tv&32rV?`j4nM*ov^A!Uc8!6&6T<d(ikc
z)l>xwfQ7&VTLp`NN6^I3B+wkd4xAm3zvJWo#8)m9Ghhi)nVI<czFy<4rDWzL&+`Yg
z9JHk8`PoIjIA74SMSg+IEF0RDEjRI|+-`3-a!|$_4I%HCuF>PKYc7}x8DE!!&?fG6
zskC)1Q&$DZS%s+5Lle;vi&B$Nir9nTxSvt_ekg?nwI{~6h|IfH&3i@gqDh_zZ1z)|
zMS0c`UzM7VXA`id>?&#eLD!-;kxlzScHEFo-k3ygaZ2N8zJR)COR?(5n`|Rnp0)LA
zQ&&}XCEpD#?=;V@pS{ZDdbp2V?Mm&6(r30&7{4EMhAn&eZ_5_*?XB`LLxj@bK{X?>
z7drvIr|z_l{xq^JSPyzoNLt~~jI1UqbM|(mJyAXWWgO|v_w3X$UKoLXlbUv?7Abl(
RHTSW_?d=4P+`G<<`~)<`(JlZ0

diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py
index 37fefdb..eedb342 100644
--- a/ofu_app/apps/food/models.py
+++ b/ofu_app/apps/food/models.py
@@ -13,19 +13,19 @@ class Menu(models.Model):
     location = models.CharField(max_length=MAX_LENGTH)
     menu = models.ManyToManyField("SingleFood")
 
-    def __str__(self):
-        return str(self.date.strftime("%d.%m.%Y"))
-
     class Meta:
         unique_together = ('date', 'location')
 
+    # def __str__(self):
+    #    return self.date.strftime("%d.%m.%Y")
+
 
 class SingleFood(models.Model):
     id = models.AutoField(primary_key=True)
     name = models.CharField(unique=True, max_length=MAX_LENGTH)
 
-    def __str__(self):
-        return str(self.name)
+    # def __str__(self):
+    #    return self.name
 
 
 class HappyHour(models.Model):
@@ -36,8 +36,8 @@ class HappyHour(models.Model):
     location = models.CharField(max_length=MAX_LENGTH)
     description = models.CharField(max_length=MAX_LENGTH)
 
-    def __str__(self):
-        return "Date: %s, Location: %s" % (self.date.strftime("%Y.%m.%d"), self.location)
-
     class Meta:
         unique_together = ('date', 'location')
+
+    # def __str__(self):
+    #    return "Date: %s, Location: %s" % (self.date.strftime("%Y.%m.%d"), self.location)