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

 Conflicts:

	skolehjem/routes/web.php

skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php

@@ -15,6 +15,7 @@ class CreateMenuPlans extends Migration
     {
         Schema::create('menu_plans', function (Blueprint $table) {
             $table->id();
+            $table->string('week', 2);
             $table->string('monday', 255);
             $table->string('tuesday', 255);
             $table->string('wednesday', 255);

skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php

@@ -16,6 +16,7 @@ class CreateAlbumsTable extends Migration
         Schema::create('albums', function (Blueprint $table) {
             $table->id();
             $table->timestamps();
+            $table->foreignId('user_id')->constrained();
         });
     }