Merge branch 'dev' of https://git.iiens.net/anteunis2018/pima_grp4 into dev

website/nutriform/models.py

@@ -2,6 +2,10 @@ from django.db import models
 
 # Create your models here.
 class Menu(models.Model):
+	type_plat = models.CharField()
     nb_plat = models.IntegerField()
-    entree = models.CharField(max_length=150)
 
+class Sport(models.Model):
+    type_sport = models.CharField(maxlength = 150)
+    nb_seances = models.IntegerField()
+    intensite = models.InteferField() 
\ No newline at end of file