Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

 Conflicts:

	skolehjem/app/Http/Controllers/ContactController.php

skolehjem/database/migrations/2020_06_08_091617_create_feedbacks.php

@@ -16,6 +16,7 @@ class CreateFeedbacks extends Migration
         Schema::create('feedbacks', function (Blueprint $table) {
             $table->id();
             $table->string("message");
+            $table->string("suggestion_form"); //Skriver om det er Ris el. Ros
             $table->timestamps();
         });
     }

skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateStaffTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('staff', function (Blueprint $table) {
+            $table->id();
+            $table->string('name_first');
+            $table->string('name_last');
+            $table->string('email')->unique();
+            $table->timestamp('email_verified_at')->nullable();
+            $table->string('password');
+            $table->integer("phone")->unique();
+            $table->rememberToken();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('staff');
+    }
+}