Merge branch 'news' into journal

# Conflicts:
#	app/Http/Controllers/Users/TeacherController.php

app/Models/Parentt.php

@@ -14,4 +14,9 @@ class Parentt extends Model
         'user_id',
     ];
 
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+
 }